1 files changed, 7 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index db1fe4bc84..9caa890082 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -85,6 +85,12 @@ DiscoverPeimsAndOrderWithApriori (
 
     Private->CurrentFvFileHandles[PeimCount] = FileHandle;
   }
+  
+  //
+  // Check whether the count of Peims exceeds the max support PEIMs in a FV image
+  // If more Peims are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.
+  //
+  ASSERT (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv));
 
   Private->AprioriCount = 0;
   if (AprioriFileHandle != NULL) {
@@ -377,7 +383,7 @@ PeiDispatcher (
               //
               // For Fv type file, Produce new FV PPI and FV hob
               //
-              Status = ProcessFvFile (PeiServices, PeimFileHandle, &AuthenticationState);
+              Status = ProcessFvFile (PeiServices, VolumeHandle, PeimFileHandle, &AuthenticationState);
             } else {
               //
               // For PEIM driver, Load its entry point