]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
MdeModulePkg PeiCore: FvCount to be checked for the registered for shadow PEIM
[mirror_edk2.git] / MdeModulePkg / Core / Pei / Dispatcher / Dispatcher.c
index b9c3fb3bdb4bc47737a569764c5b75bce9efcd9f..0ac3fdde6a9a7440b6ccc570028ba23a0f2b078e 100644 (file)
@@ -1,7 +1,8 @@
 /** @file\r
   EFI PEI Core dispatch services\r
   \r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -14,16 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "PeiMain.h"\r
 \r
-///\r
-/// temporary memory is filled with this initial value during SEC phase\r
-///\r
-#define INIT_CAR_VALUE 0x5AA55AA5\r
-\r
-typedef struct {\r
-  EFI_STATUS_CODE_DATA  DataHeader;\r
-  EFI_HANDLE            Handle;\r
-} PEIM_FILE_HANDLE_EXTENDED_DATA;\r
-\r
 /**\r
 \r
   Discover all Peims and optional Apriori file in one FV. There is at most one\r
@@ -631,6 +622,315 @@ PeiCoreEntry (
   PeiCore (SecCoreData, NULL, Private);\r
 }\r
 \r
+/**\r
+  Check SwitchStackSignal and switch stack if SwitchStackSignal is TRUE.\r
+\r
+  @param[in] SecCoreData    Points to a data structure containing information about the PEI core's operating\r
+                            environment, such as the size and location of temporary RAM, the stack location and\r
+                            the BFV location.\r
+  @param[in] Private        Pointer to the private data passed in from caller.\r
+\r
+**/\r
+VOID\r
+PeiCheckAndSwitchStack (\r
+  IN CONST EFI_SEC_PEI_HAND_OFF         *SecCoreData,\r
+  IN PEI_CORE_INSTANCE                  *Private\r
+  )\r
+{\r
+  VOID                                  *LoadFixPeiCodeBegin;\r
+  EFI_STATUS                            Status;\r
+  CONST EFI_PEI_SERVICES                **PeiServices;\r
+  UINT64                                NewStackSize;\r
+  EFI_PHYSICAL_ADDRESS                  TopOfOldStack;\r
+  EFI_PHYSICAL_ADDRESS                  TopOfNewStack;\r
+  UINTN                                 StackOffset;\r
+  BOOLEAN                               StackOffsetPositive;\r
+  EFI_PHYSICAL_ADDRESS                  TemporaryRamBase;\r
+  UINTN                                 TemporaryRamSize;\r
+  UINTN                                 TemporaryStackSize;\r
+  VOID                                  *TemporaryStackBase;\r
+  UINTN                                 PeiTemporaryRamSize;\r
+  VOID                                  *PeiTemporaryRamBase;\r
+  EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI     *TemporaryRamSupportPpi;\r
+  EFI_PHYSICAL_ADDRESS                  BaseOfNewHeap;\r
+  EFI_PHYSICAL_ADDRESS                  HoleMemBase;\r
+  UINTN                                 HoleMemSize;\r
+  UINTN                                 HeapTemporaryRamSize;\r
+  EFI_PHYSICAL_ADDRESS                  TempBase1;\r
+  UINTN                                 TempSize1;\r
+  EFI_PHYSICAL_ADDRESS                  TempBase2;\r
+  UINTN                                 TempSize2;\r
+  UINTN                                 Index;\r
+\r
+  PeiServices = (CONST EFI_PEI_SERVICES **) &Private->Ps;\r
+\r
+  if (Private->SwitchStackSignal) {\r
+    //\r
+    // Before switch stack from temporary memory to permanent memory, calculate the heap and stack\r
+    // usage in temporary memory for debugging.\r
+    //\r
+    DEBUG_CODE_BEGIN ();\r
+      UINT32                *StackPointer;\r
+      EFI_PEI_HOB_POINTERS  Hob;\r
+\r
+      for (StackPointer = (UINT32*)SecCoreData->StackBase;\r
+           (StackPointer < (UINT32*)((UINTN)SecCoreData->StackBase + SecCoreData->StackSize)) \\r
+           && (*StackPointer == PcdGet32 (PcdInitValueInTempStack));\r
+           StackPointer ++) {\r
+      }\r
+\r
+      DEBUG ((DEBUG_INFO, "Temp Stack : BaseAddress=0x%p Length=0x%X\n", SecCoreData->StackBase, (UINT32)SecCoreData->StackSize));\r
+      DEBUG ((DEBUG_INFO, "Temp Heap  : BaseAddress=0x%p Length=0x%X\n", SecCoreData->PeiTemporaryRamBase, (UINT32)SecCoreData->PeiTemporaryRamSize));\r
+      DEBUG ((DEBUG_INFO, "Total temporary memory:    %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
+      DEBUG ((DEBUG_INFO, "  temporary memory stack ever used:       %d bytes.\n",\r
+             (UINT32)(SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
+            ));\r
+      DEBUG ((DEBUG_INFO, "  temporary memory heap used for HobList: %d bytes.\n",\r
+             (UINT32)((UINTN)Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN)Private->HobList.Raw)\r
+            ));\r
+      DEBUG ((DEBUG_INFO, "  temporary memory heap occupied by memory pages: %d bytes.\n",\r
+             (UINT32)(UINTN)(Private->HobList.HandoffInformationTable->EfiMemoryTop - Private->HobList.HandoffInformationTable->EfiFreeMemoryTop)\r
+            ));\r
+      for (Hob.Raw = Private->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+        if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
+          DEBUG ((DEBUG_INFO, "Memory Allocation 0x%08x 0x%0lx - 0x%0lx\n", \\r
+            Hob.MemoryAllocation->AllocDescriptor.MemoryType,               \\r
+            Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress,        \\r
+            Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress + Hob.MemoryAllocation->AllocDescriptor.MemoryLength - 1));\r
+        }\r
+      }\r
+    DEBUG_CODE_END ();\r
+\r
+    if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+      //\r
+      // Loading Module at Fixed Address is enabled\r
+      //\r
+      PeiLoadFixAddressHook (Private);\r
+\r
+      //\r
+      // If Loading Module at Fixed Address is enabled, Allocating memory range for Pei code range.\r
+      //\r
+      LoadFixPeiCodeBegin = AllocatePages((UINTN)PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PeiCodeBegin = 0x%lX, PeiCodeTop= 0x%lX\n", (UINT64)(UINTN)LoadFixPeiCodeBegin, (UINT64)((UINTN)LoadFixPeiCodeBegin + PcdGet32(PcdLoadFixAddressPeiCodePageNumber) * EFI_PAGE_SIZE)));\r
+    }\r
+\r
+    //\r
+    // Reserve the size of new stack at bottom of physical memory\r
+    //\r
+    // The size of new stack in permanent memory must be the same size\r
+    // or larger than the size of old stack in temporary memory.\r
+    // But if new stack is smaller than the size of old stack, we also reserve\r
+    // the size of old stack at bottom of permanent memory.\r
+    //\r
+    NewStackSize = RShiftU64 (Private->PhysicalMemoryLength, 1);\r
+    NewStackSize = ALIGN_VALUE (NewStackSize, EFI_PAGE_SIZE);\r
+    NewStackSize = MIN (PcdGet32(PcdPeiCoreMaxPeiStackSize), NewStackSize);\r
+    DEBUG ((EFI_D_INFO, "Old Stack size %d, New stack size %d\n", (UINT32)SecCoreData->StackSize, (UINT32)NewStackSize));\r
+    ASSERT (NewStackSize >= SecCoreData->StackSize);\r
+\r
+    //\r
+    // Calculate stack offset and heap offset between temporary memory and new permement \r
+    // memory seperately.\r
+    //\r
+    TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r
+    TopOfNewStack = Private->PhysicalMemoryBegin + NewStackSize;\r
+    if (TopOfNewStack >= TopOfOldStack) {\r
+      StackOffsetPositive = TRUE;\r
+      StackOffset = (UINTN)(TopOfNewStack - TopOfOldStack);\r
+    } else {\r
+      StackOffsetPositive = FALSE;\r
+      StackOffset = (UINTN)(TopOfOldStack - TopOfNewStack);\r
+    }\r
+    Private->StackOffsetPositive = StackOffsetPositive;\r
+    Private->StackOffset = StackOffset;\r
+\r
+    //\r
+    // Build Stack HOB that describes the permanent memory stack\r
+    //\r
+    DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n", TopOfNewStack - NewStackSize, NewStackSize));\r
+    BuildStackHob (TopOfNewStack - NewStackSize, NewStackSize);\r
+\r
+    //\r
+    // Cache information from SecCoreData into locals before SecCoreData is converted to a permanent memory address\r
+    //\r
+    TemporaryRamBase    = (EFI_PHYSICAL_ADDRESS)(UINTN)SecCoreData->TemporaryRamBase;\r
+    TemporaryRamSize    = SecCoreData->TemporaryRamSize;\r
+    TemporaryStackSize  = SecCoreData->StackSize;\r
+    TemporaryStackBase  = SecCoreData->StackBase;\r
+    PeiTemporaryRamSize = SecCoreData->PeiTemporaryRamSize;\r
+    PeiTemporaryRamBase = SecCoreData->PeiTemporaryRamBase;\r
+\r
+    //\r
+    // TemporaryRamSupportPpi is produced by platform's SEC\r
+    //\r
+    Status = PeiServicesLocatePpi (\r
+               &gEfiTemporaryRamSupportPpiGuid,\r
+               0,\r
+               NULL,\r
+               (VOID**)&TemporaryRamSupportPpi\r
+               );\r
+    if (!EFI_ERROR (Status)) {\r
+      //\r
+      // Heap Offset\r
+      //\r
+      BaseOfNewHeap = TopOfNewStack;\r
+      if (BaseOfNewHeap >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
+        Private->HeapOffsetPositive = TRUE;\r
+        Private->HeapOffset = (UINTN)(BaseOfNewHeap - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
+      } else {\r
+        Private->HeapOffsetPositive = FALSE;\r
+        Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);\r
+      }\r
+\r
+      DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
+\r
+      //\r
+      // Calculate new HandOffTable and PrivateData address in permanent memory's stack\r
+      //\r
+      if (StackOffsetPositive) {\r
+        SecCoreData = (CONST EFI_SEC_PEI_HAND_OFF *)((UINTN)(VOID *)SecCoreData + StackOffset);\r
+        Private = (PEI_CORE_INSTANCE *)((UINTN)(VOID *)Private + StackOffset);\r
+      } else {\r
+        SecCoreData = (CONST EFI_SEC_PEI_HAND_OFF *)((UINTN)(VOID *)SecCoreData - StackOffset);\r
+        Private = (PEI_CORE_INSTANCE *)((UINTN)(VOID *)Private - StackOffset);\r
+      }\r
+\r
+      //\r
+      // Temporary Ram Support PPI is provided by platform, it will copy \r
+      // temporary memory to permanent memory and do stack switching.\r
+      // After invoking Temporary Ram Support PPI, the following code's \r
+      // stack is in permanent memory.\r
+      //\r
+      TemporaryRamSupportPpi->TemporaryRamMigration (\r
+                                PeiServices,\r
+                                TemporaryRamBase,\r
+                                (EFI_PHYSICAL_ADDRESS)(UINTN)(TopOfNewStack - TemporaryStackSize),\r
+                                TemporaryRamSize\r
+                                );\r
+\r
+      //\r
+      // Migrate memory pages allocated in pre-memory phase.\r
+      // It could not be called before calling TemporaryRamSupportPpi->TemporaryRamMigration()\r
+      // as the migrated memory pages may be overridden by TemporaryRamSupportPpi->TemporaryRamMigration().\r
+      //\r
+      MigrateMemoryPages (Private, TRUE);\r
+\r
+      //\r
+      // Entry PEI Phase 2\r
+      //\r
+      PeiCore (SecCoreData, NULL, Private);\r
+    } else {\r
+      //\r
+      // Migrate memory pages allocated in pre-memory phase.\r
+      //\r
+      MigrateMemoryPages (Private, FALSE);\r
+\r
+      //\r
+      // Migrate the PEI Services Table pointer from temporary RAM to permanent RAM.\r
+      //\r
+      MigratePeiServicesTablePointer ();\r
+\r
+      //\r
+      // Heap Offset\r
+      //\r
+      BaseOfNewHeap = TopOfNewStack;\r
+      HoleMemBase   = TopOfNewStack;\r
+      HoleMemSize   = TemporaryRamSize - PeiTemporaryRamSize - TemporaryStackSize;\r
+      if (HoleMemSize != 0) {\r
+        //\r
+        // Make sure HOB List start address is 8 byte alignment.\r
+        //\r
+        BaseOfNewHeap = ALIGN_VALUE (BaseOfNewHeap + HoleMemSize, 8);\r
+      }\r
+      if (BaseOfNewHeap >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
+        Private->HeapOffsetPositive = TRUE;\r
+        Private->HeapOffset = (UINTN)(BaseOfNewHeap - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
+      } else {\r
+        Private->HeapOffsetPositive = FALSE;\r
+        Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);\r
+      }\r
+\r
+      DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
+\r
+      //\r
+      // Migrate Heap\r
+      //\r
+      HeapTemporaryRamSize = (UINTN) (Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - Private->HobList.HandoffInformationTable->EfiMemoryBottom);\r
+      ASSERT (BaseOfNewHeap + HeapTemporaryRamSize <= Private->FreePhysicalMemoryTop);\r
+      CopyMem ((UINT8 *) (UINTN) BaseOfNewHeap, PeiTemporaryRamBase, HeapTemporaryRamSize);\r
+\r
+      //\r
+      // Migrate Stack\r
+      //\r
+      CopyMem ((UINT8 *) (UINTN) (TopOfNewStack - TemporaryStackSize), TemporaryStackBase, TemporaryStackSize);\r
+\r
+      //\r
+      // Copy Hole Range Data\r
+      //\r
+      if (HoleMemSize != 0) {\r
+        //\r
+        // Prepare Hole\r
+        //\r
+        if (PeiTemporaryRamBase < TemporaryStackBase) {\r
+          TempBase1 = (EFI_PHYSICAL_ADDRESS) (UINTN) PeiTemporaryRamBase;\r
+          TempSize1 = PeiTemporaryRamSize;\r
+          TempBase2 = (EFI_PHYSICAL_ADDRESS) (UINTN) TemporaryStackBase;\r
+          TempSize2 = TemporaryStackSize;\r
+        } else {\r
+          TempBase1 = (EFI_PHYSICAL_ADDRESS) (UINTN) TemporaryStackBase;\r
+          TempSize1 = TemporaryStackSize;\r
+          TempBase2 =(EFI_PHYSICAL_ADDRESS) (UINTN) PeiTemporaryRamBase;\r
+          TempSize2 = PeiTemporaryRamSize;\r
+        }\r
+        if (TemporaryRamBase < TempBase1) {\r
+          Private->HoleData[0].Base = TemporaryRamBase;\r
+          Private->HoleData[0].Size = (UINTN) (TempBase1 - TemporaryRamBase);\r
+        }\r
+        if (TempBase1 + TempSize1 < TempBase2) {\r
+          Private->HoleData[1].Base = TempBase1 + TempSize1;\r
+          Private->HoleData[1].Size = (UINTN) (TempBase2 - TempBase1 - TempSize1);\r
+        }\r
+        if (TempBase2 + TempSize2 < TemporaryRamBase + TemporaryRamSize) {\r
+          Private->HoleData[2].Base = TempBase2 + TempSize2;\r
+          Private->HoleData[2].Size = (UINTN) (TemporaryRamBase + TemporaryRamSize - TempBase2 - TempSize2);\r
+        }\r
+\r
+        //\r
+        // Copy Hole Range data.\r
+        //\r
+        for (Index = 0; Index < HOLE_MAX_NUMBER; Index ++) {\r
+          if (Private->HoleData[Index].Size > 0) {\r
+            if (HoleMemBase > Private->HoleData[Index].Base) {\r
+              Private->HoleData[Index].OffsetPositive = TRUE;\r
+              Private->HoleData[Index].Offset = (UINTN) (HoleMemBase - Private->HoleData[Index].Base);\r
+            } else {\r
+              Private->HoleData[Index].OffsetPositive = FALSE;\r
+              Private->HoleData[Index].Offset = (UINTN) (Private->HoleData[Index].Base - HoleMemBase);\r
+            }\r
+            CopyMem ((VOID *) (UINTN) HoleMemBase, (VOID *) (UINTN) Private->HoleData[Index].Base, Private->HoleData[Index].Size);\r
+            HoleMemBase = HoleMemBase + Private->HoleData[Index].Size;\r
+          }\r
+        }\r
+      }\r
+\r
+      //\r
+      // Switch new stack\r
+      //\r
+      SwitchStack (\r
+        (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntry,\r
+        (VOID *) SecCoreData,\r
+        (VOID *) Private,\r
+        (VOID *) (UINTN) TopOfNewStack\r
+        );\r
+    }\r
+\r
+    //\r
+    // Code should not come here\r
+    //\r
+    ASSERT (FALSE);\r
+  }\r
+}\r
+\r
 /**\r
   Conduct PEIM dispatch.\r
 \r
@@ -659,31 +959,8 @@ PeiDispatcher (
   UINTN                               SaveCurrentPeimCount;\r
   UINTN                               SaveCurrentFvCount;\r
   EFI_PEI_FILE_HANDLE                 SaveCurrentFileHandle;\r
-  PEIM_FILE_HANDLE_EXTENDED_DATA      ExtendedData;\r
-  EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI   *TemporaryRamSupportPpi;\r
-  UINT64                              NewStackSize;\r
-  UINTN                               HeapTemporaryRamSize;\r
-  EFI_PHYSICAL_ADDRESS                BaseOfNewHeap;\r
-  EFI_PHYSICAL_ADDRESS                TopOfNewStack;\r
-  EFI_PHYSICAL_ADDRESS                TopOfOldStack;\r
-  EFI_PHYSICAL_ADDRESS                TemporaryRamBase;\r
-  UINTN                               TemporaryRamSize;\r
-  UINTN                               TemporaryStackSize;\r
-  VOID                                *TemporaryStackBase;\r
-  UINTN                               PeiTemporaryRamSize;\r
-  VOID                                *PeiTemporaryRamBase;\r
-  UINTN                               StackOffset;\r
-  BOOLEAN                             StackOffsetPositive;\r
-  EFI_PHYSICAL_ADDRESS                HoleMemBase;\r
-  UINTN                               HoleMemSize;\r
   EFI_FV_FILE_INFO                    FvFileInfo;\r
   PEI_CORE_FV_HANDLE                  *CoreFvHandle;\r
-  VOID                                *LoadFixPeiCodeBegin;\r
-  EFI_PHYSICAL_ADDRESS                TempBase1;\r
-  UINTN                               TempSize1;\r
-  EFI_PHYSICAL_ADDRESS                TempBase2;\r
-  UINTN                               TempSize2;\r
-  UINTN                               Index;\r
   \r
   PeiServices = (CONST EFI_PEI_SERVICES **) &Private->Ps;\r
   PeimEntryPoint = NULL;\r
@@ -693,31 +970,31 @@ PeiDispatcher (
   if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
     //\r
     // Once real memory is available, shadow the RegisterForShadow modules. And meanwhile\r
-    // update the modules' status from PEIM_STATE_REGISITER_FOR_SHADOW to PEIM_STATE_DONE.\r
+    // update the modules' status from PEIM_STATE_REGISTER_FOR_SHADOW to PEIM_STATE_DONE.\r
     //\r
     SaveCurrentPeimCount  = Private->CurrentPeimCount;\r
     SaveCurrentFvCount    = Private->CurrentPeimFvCount;\r
     SaveCurrentFileHandle =  Private->CurrentFileHandle;\r
 \r
-    for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {\r
+    for (Index1 = 0; Index1 < Private->FvCount; Index1++) {\r
       for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {\r
-        if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {\r
+        if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISTER_FOR_SHADOW) {\r
           PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];\r
+          Private->CurrentFileHandle   = PeimFileHandle;\r
+          Private->CurrentPeimFvCount  = Index1;\r
+          Private->CurrentPeimCount    = Index2;\r
           Status = PeiLoadImage (\r
                     (CONST EFI_PEI_SERVICES **) &Private->Ps,\r
                     PeimFileHandle,\r
-                    PEIM_STATE_REGISITER_FOR_SHADOW,\r
+                    PEIM_STATE_REGISTER_FOR_SHADOW,\r
                     &EntryPoint,\r
                     &AuthenticationState\r
                     );\r
           if (Status == EFI_SUCCESS) {\r
             //\r
-            // PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE\r
+            // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE\r
             //\r
             Private->Fv[Index1].PeimState[Index2]++;\r
-            Private->CurrentFileHandle   = PeimFileHandle;\r
-            Private->CurrentPeimFvCount  = Index1;\r
-            Private->CurrentPeimCount    = Index2;\r
             //\r
             // Call the PEIM entry point\r
             //\r
@@ -799,7 +1076,7 @@ PeiDispatcher (
             ASSERT_EFI_ERROR (Status);\r
             if (FvFileInfo.FileType == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) {\r
               //\r
-              // For Fv type file, Produce new FV PPI and FV hob\r
+              // For Fv type file, Produce new FvInfo PPI and FV hob\r
               //\r
               Status = ProcessFvFile (Private, &Private->Fv[FvCount], PeimFileHandle);\r
               if (Status == EFI_SUCCESS) {\r
@@ -808,6 +1085,13 @@ PeiDispatcher (
                 //\r
                 Private->Fv[FvCount].PeimState[PeimCount]++;\r
                 Private->PeimDispatchOnThisPass = TRUE;\r
+              } else {\r
+                //\r
+                // The related GuidedSectionExtraction/Decompress PPI for the\r
+                // encapsulated FV image section may be installed in the rest\r
+                // of this do-while loop, so need to make another pass.\r
+                //\r
+                Private->PeimNeedingDispatch = TRUE;\r
               }\r
             } else {\r
               //\r
@@ -827,13 +1111,11 @@ PeiDispatcher (
                 //\r
                 PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
 \r
-                ExtendedData.Handle = (EFI_HANDLE)PeimFileHandle;\r
-\r
                 REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
                   EFI_PROGRESS_CODE,\r
                   (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
-                  (VOID *)(&ExtendedData),\r
-                  sizeof (ExtendedData)\r
+                  (VOID *)(&PeimFileHandle),\r
+                  sizeof (PeimFileHandle)\r
                   );\r
 \r
                 Status = VerifyPeim (Private, CoreFvHandle->FvHandle, PeimFileHandle, AuthenticationState);\r
@@ -848,260 +1130,27 @@ PeiDispatcher (
                   PeimEntryPoint = (EFI_PEIM_ENTRY_POINT2)(UINTN)EntryPoint;\r
                   PeimEntryPoint (PeimFileHandle, (const EFI_PEI_SERVICES **) PeiServices);\r
                   Private->PeimDispatchOnThisPass = TRUE;\r
+                } else {\r
+                  //\r
+                  // The related GuidedSectionExtraction PPI for the\r
+                  // signed PEIM image section may be installed in the rest\r
+                  // of this do-while loop, so need to make another pass.\r
+                  //\r
+                  Private->PeimNeedingDispatch = TRUE;\r
                 }\r
 \r
                 REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
                   EFI_PROGRESS_CODE,\r
                   (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_END),\r
-                  (VOID *)(&ExtendedData),\r
-                  sizeof (ExtendedData)\r
+                  (VOID *)(&PeimFileHandle),\r
+                  sizeof (PeimFileHandle)\r
                   );\r
                 PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
 \r
               }\r
             }\r
 \r
-            if (Private->SwitchStackSignal) {\r
-              //\r
-              // Before switch stack from temporary memory to permenent memory, calculate the heap and stack\r
-              // usage in temporary memory for debuging.\r
-              //\r
-              DEBUG_CODE_BEGIN ();\r
-                UINT32  *StackPointer;\r
-                \r
-                for (StackPointer = (UINT32*)SecCoreData->StackBase;\r
-                     (StackPointer < (UINT32*)((UINTN)SecCoreData->StackBase + SecCoreData->StackSize)) \\r
-                     && (*StackPointer == INIT_CAR_VALUE);\r
-                     StackPointer ++);\r
-                     \r
-                DEBUG ((EFI_D_INFO, "Temp Stack : BaseAddress=0x%p Length=0x%X\n", SecCoreData->StackBase, (UINT32)SecCoreData->StackSize));\r
-                DEBUG ((EFI_D_INFO, "Temp Heap  : BaseAddress=0x%p Length=0x%X\n", Private->HobList.Raw, (UINT32)((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN) Private->HobList.Raw)));\r
-                DEBUG ((EFI_D_INFO, "Total temporary memory:    %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
-                DEBUG ((EFI_D_INFO, "  temporary memory stack ever used: %d bytes.\n",\r
-                       (UINT32)(SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
-                      ));\r
-                DEBUG ((EFI_D_INFO, "  temporary memory heap used:       %d bytes.\n",\r
-                       (UINT32)((UINTN)Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN)Private->HobList.Raw)\r
-                      ));\r
-              DEBUG_CODE_END ();\r
-              \r
-              if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
-                //\r
-                // Loading Module at Fixed Address is enabled\r
-                //\r
-                PeiLoadFixAddressHook (Private);\r
-\r
-                //\r
-                // If Loading Module at Fixed Address is enabled, Allocating memory range for Pei code range.\r
-                //\r
-                LoadFixPeiCodeBegin = AllocatePages((UINTN)PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
-                DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PeiCodeBegin = 0x%lX, PeiCodeTop= 0x%lX\n", (UINT64)(UINTN)LoadFixPeiCodeBegin, (UINT64)((UINTN)LoadFixPeiCodeBegin + PcdGet32(PcdLoadFixAddressPeiCodePageNumber) * EFI_PAGE_SIZE)));\r
-              }\r
-              \r
-              //\r
-              // Reserve the size of new stack at bottom of physical memory\r
-              //\r
-              // The size of new stack in permenent memory must be the same size \r
-              // or larger than the size of old stack in temporary memory.\r
-              // But if new stack is smaller than the size of old stack, we also reserve\r
-              // the size of old stack at bottom of permenent memory.\r
-              //\r
-              NewStackSize = RShiftU64 (Private->PhysicalMemoryLength, 1);\r
-              NewStackSize = ALIGN_VALUE (NewStackSize, EFI_PAGE_SIZE);\r
-              NewStackSize = MIN (PcdGet32(PcdPeiCoreMaxPeiStackSize), NewStackSize);\r
-              DEBUG ((EFI_D_INFO, "Old Stack size %d, New stack size %d\n", (UINT32)SecCoreData->StackSize, (UINT32)NewStackSize));\r
-              ASSERT (NewStackSize >= SecCoreData->StackSize);\r
-\r
-              //\r
-              // Calculate stack offset and heap offset between temporary memory and new permement \r
-              // memory seperately.\r
-              //\r
-              TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r
-              TopOfNewStack = Private->PhysicalMemoryBegin + NewStackSize;\r
-              if (TopOfNewStack >= TopOfOldStack) {\r
-                StackOffsetPositive = TRUE;\r
-                StackOffset = (UINTN)(TopOfNewStack - TopOfOldStack);\r
-              } else {\r
-                StackOffsetPositive = FALSE;\r
-                StackOffset = (UINTN)(TopOfOldStack - TopOfNewStack);\r
-              }\r
-              Private->StackOffsetPositive = StackOffsetPositive;\r
-              Private->StackOffset = StackOffset;\r
-\r
-              //\r
-              // Build Stack HOB that describes the permanent memory stack\r
-              //\r
-              DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n", TopOfNewStack - NewStackSize, NewStackSize));\r
-              BuildStackHob (TopOfNewStack - NewStackSize, NewStackSize);\r
-\r
-              //\r
-              // Cache information from SecCoreData into locals before SecCoreData is converted to a permanent memory address\r
-              //\r
-              TemporaryRamBase    = (EFI_PHYSICAL_ADDRESS)(UINTN)SecCoreData->TemporaryRamBase;\r
-              TemporaryRamSize    = SecCoreData->TemporaryRamSize;\r
-              TemporaryStackSize  = SecCoreData->StackSize;\r
-              TemporaryStackBase  = SecCoreData->StackBase;\r
-              PeiTemporaryRamSize = SecCoreData->PeiTemporaryRamSize;\r
-              PeiTemporaryRamBase = SecCoreData->PeiTemporaryRamBase;\r
-              \r
-              //\r
-              // TemporaryRamSupportPpi is produced by platform's SEC\r
-              //\r
-              Status = PeiServicesLocatePpi (\r
-                         &gEfiTemporaryRamSupportPpiGuid,\r
-                         0,\r
-                         NULL,\r
-                         (VOID**)&TemporaryRamSupportPpi\r
-                         );\r
-              if (!EFI_ERROR (Status)) {\r
-                //\r
-                // Heap Offset\r
-                //\r
-                BaseOfNewHeap = TopOfNewStack;\r
-                if (BaseOfNewHeap >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
-                  Private->HeapOffsetPositive = TRUE;\r
-                  Private->HeapOffset = (UINTN)(BaseOfNewHeap - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
-                } else {\r
-                  Private->HeapOffsetPositive = FALSE;\r
-                  Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);\r
-                }\r
-\r
-                DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
-\r
-                //\r
-                // Calculate new HandOffTable and PrivateData address in permanent memory's stack\r
-                //\r
-                if (StackOffsetPositive) {\r
-                  SecCoreData = (CONST EFI_SEC_PEI_HAND_OFF *)((UINTN)(VOID *)SecCoreData + StackOffset);\r
-                  Private = (PEI_CORE_INSTANCE *)((UINTN)(VOID *)Private + StackOffset);\r
-                } else {\r
-                  SecCoreData = (CONST EFI_SEC_PEI_HAND_OFF *)((UINTN)(VOID *)SecCoreData - StackOffset);\r
-                  Private = (PEI_CORE_INSTANCE *)((UINTN)(VOID *)Private - StackOffset);\r
-                }\r
-\r
-                //\r
-                // Temporary Ram Support PPI is provided by platform, it will copy \r
-                // temporary memory to permenent memory and do stack switching.\r
-                // After invoking Temporary Ram Support PPI, the following code's \r
-                // stack is in permanent memory.\r
-                //\r
-                TemporaryRamSupportPpi->TemporaryRamMigration (\r
-                                          PeiServices,\r
-                                          TemporaryRamBase,\r
-                                          (EFI_PHYSICAL_ADDRESS)(UINTN)(TopOfNewStack - TemporaryStackSize),\r
-                                          TemporaryRamSize\r
-                                          );\r
-\r
-                //\r
-                // Entry PEI Phase 2\r
-                //\r
-                PeiCore (SecCoreData, NULL, Private);\r
-              } else {\r
-                //\r
-                // Migrate the PEI Services Table pointer from temporary RAM to permanent RAM.\r
-                //\r
-                MigratePeiServicesTablePointer ();\r
-                \r
-                //\r
-                // Heap Offset\r
-                //\r
-                BaseOfNewHeap = TopOfNewStack;\r
-                HoleMemBase   = TopOfNewStack;\r
-                HoleMemSize   = TemporaryRamSize - PeiTemporaryRamSize - TemporaryStackSize;\r
-                if (HoleMemSize != 0) {\r
-                  //\r
-                  // Make sure HOB List start address is 8 byte alignment.\r
-                  //\r
-                  BaseOfNewHeap = ALIGN_VALUE (BaseOfNewHeap + HoleMemSize, 8);\r
-                }\r
-                if (BaseOfNewHeap >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
-                  Private->HeapOffsetPositive = TRUE;\r
-                  Private->HeapOffset = (UINTN)(BaseOfNewHeap - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
-                } else {\r
-                  Private->HeapOffsetPositive = FALSE;\r
-                  Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);\r
-                }\r
-\r
-                DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
-\r
-                //\r
-                // Migrate Heap\r
-                //\r
-                HeapTemporaryRamSize = (UINTN) (Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - Private->HobList.HandoffInformationTable->EfiMemoryBottom);\r
-                ASSERT (BaseOfNewHeap + HeapTemporaryRamSize <= Private->FreePhysicalMemoryTop);\r
-                CopyMem ((UINT8 *) (UINTN) BaseOfNewHeap, (UINT8 *) PeiTemporaryRamBase, HeapTemporaryRamSize);\r
-                \r
-                //\r
-                // Migrate Stack\r
-                //\r
-                CopyMem ((UINT8 *) (UINTN) (TopOfNewStack - TemporaryStackSize), TemporaryStackBase, TemporaryStackSize);\r
-                \r
-                //\r
-                // Copy Hole Range Data\r
-                // Convert PPI from Hole. \r
-                //\r
-                if (HoleMemSize != 0) {\r
-                  //\r
-                  // Prepare Hole\r
-                  //\r
-                  if (PeiTemporaryRamBase < TemporaryStackBase) {\r
-                    TempBase1 = (EFI_PHYSICAL_ADDRESS) (UINTN) PeiTemporaryRamBase;\r
-                    TempSize1 = PeiTemporaryRamSize;\r
-                    TempBase2 = (EFI_PHYSICAL_ADDRESS) (UINTN) TemporaryStackBase;\r
-                    TempSize2 = TemporaryStackSize;\r
-                  } else {\r
-                    TempBase1 = (EFI_PHYSICAL_ADDRESS) (UINTN) TemporaryStackBase;\r
-                    TempSize1 = TemporaryStackSize;\r
-                    TempBase2 =(EFI_PHYSICAL_ADDRESS) (UINTN) PeiTemporaryRamBase;\r
-                    TempSize2 = PeiTemporaryRamSize;\r
-                  }\r
-                  if (TemporaryRamBase < TempBase1) {\r
-                    Private->HoleData[0].Base = TemporaryRamBase;\r
-                    Private->HoleData[0].Size = (UINTN) (TempBase1 - TemporaryRamBase);\r
-                  }\r
-                  if (TempBase1 + TempSize1 < TempBase2) {\r
-                    Private->HoleData[1].Base = TempBase1 + TempSize1;\r
-                    Private->HoleData[1].Size = (UINTN) (TempBase2 - TempBase1 - TempSize1);\r
-                  }\r
-                  if (TempBase2 + TempSize2 < TemporaryRamBase + TemporaryRamSize) {\r
-                    Private->HoleData[2].Base = TempBase2 + TempSize2;\r
-                    Private->HoleData[2].Size = (UINTN) (TemporaryRamBase + TemporaryRamSize - TempBase2 - TempSize2);\r
-                  }\r
-                  \r
-                  //\r
-                  // Copy Hole Range data.\r
-                  //\r
-                  for (Index = 0; Index < HOLE_MAX_NUMBER; Index ++) {\r
-                    if (Private->HoleData[Index].Size > 0) {\r
-                      if (HoleMemBase > Private->HoleData[Index].Base) {\r
-                        Private->HoleData[Index].OffsetPositive = TRUE;\r
-                        Private->HoleData[Index].Offset = (UINTN) (HoleMemBase - Private->HoleData[Index].Base);\r
-                      } else {\r
-                        Private->HoleData[Index].OffsetPositive = FALSE;\r
-                        Private->HoleData[Index].Offset = (UINTN) (Private->HoleData[Index].Base - HoleMemBase);\r
-                      }\r
-                      CopyMem ((VOID *) (UINTN) HoleMemBase, (VOID *) (UINTN) Private->HoleData[Index].Base, Private->HoleData[Index].Size);\r
-                      HoleMemBase = HoleMemBase + Private->HoleData[Index].Size;\r
-                    }\r
-                  }\r
-                }\r
-\r
-                //\r
-                // Switch new stack\r
-                //\r
-                SwitchStack (\r
-                  (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntry,\r
-                  (VOID *) SecCoreData,\r
-                  (VOID *) Private,\r
-                  (VOID *) (UINTN) TopOfNewStack\r
-                  );\r
-              }\r
-\r
-              //\r
-              // Code should not come here\r
-              //\r
-              ASSERT (FALSE);\r
-            }\r
+            PeiCheckAndSwitchStack (SecCoreData, Private);\r
 \r
             //\r
             // Process the Notify list and dispatch any notifies for\r
@@ -1109,19 +1158,41 @@ PeiDispatcher (
             //\r
             ProcessNotifyList (Private);\r
 \r
-            if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW) &&   \\r
+            //\r
+            // Recheck SwitchStackSignal after ProcessNotifyList()\r
+            // in case PeiInstallPeiMemory() is done in a callback with\r
+            // EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH.\r
+            //\r
+            PeiCheckAndSwitchStack (SecCoreData, Private);\r
+\r
+            if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW) &&   \\r
                 (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
               //\r
-              // If memory is availble we shadow images by default for performance reasons.\r
+              // If memory is available we shadow images by default for performance reasons.\r
               // We call the entry point a 2nd time so the module knows it's shadowed.\r
               //\r
               //PERF_START (PeiServices, L"PEIM", PeimFileHandle, 0);\r
+              if ((Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) && !PcdGetBool (PcdShadowPeimOnBoot)) {\r
+                //\r
+                // Load PEIM into Memory for Register for shadow PEIM.\r
+                //\r
+                Status = PeiLoadImage (\r
+                           PeiServices,\r
+                           PeimFileHandle,\r
+                           PEIM_STATE_REGISTER_FOR_SHADOW,\r
+                           &EntryPoint,\r
+                           &AuthenticationState\r
+                           );\r
+                if (Status == EFI_SUCCESS) {\r
+                  PeimEntryPoint = (EFI_PEIM_ENTRY_POINT2)(UINTN)EntryPoint;\r
+                }\r
+              }\r
               ASSERT (PeimEntryPoint != NULL);\r
               PeimEntryPoint (PeimFileHandle, (const EFI_PEI_SERVICES **) PeiServices);\r
               //PERF_END (PeiServices, L"PEIM", PeimFileHandle, 0);\r
 \r
               //\r
-              // PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE\r
+              // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE\r
               //\r
               Private->Fv[FvCount].PeimState[PeimCount]++;\r
 \r
@@ -1155,11 +1226,11 @@ PeiDispatcher (
     Private->CurrentPeimFvCount = 0;\r
 \r
     //\r
-    // PeimNeedingDispatch being TRUE means we found a PEIM that did not get\r
+    // PeimNeedingDispatch being TRUE means we found a PEIM/FV that did not get\r
     //  dispatched. So we need to make another pass\r
     //\r
-    // PeimDispatchOnThisPass being TRUE means we dispatched a PEIM on this\r
-    //  pass. If we did not dispatch a PEIM there is no point in trying again\r
+    // PeimDispatchOnThisPass being TRUE means we dispatched a PEIM/FV on this\r
+    //  pass. If we did not dispatch a PEIM/FV there is no point in trying again\r
     //  as it will fail the next time too (nothing has changed).\r
     //\r
   } while (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass);\r
@@ -1285,14 +1356,14 @@ PeiRegisterForShadow (
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] >= PEIM_STATE_REGISITER_FOR_SHADOW) {\r
+  if (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] >= PEIM_STATE_REGISTER_FOR_SHADOW) {\r
     //\r
     // If the PEIM has already entered the PEIM_STATE_REGISTER_FOR_SHADOW or PEIM_STATE_DONE then it's already been started\r
     //\r
     return EFI_ALREADY_STARTED;\r
   }\r
 \r
-  Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = PEIM_STATE_REGISITER_FOR_SHADOW;\r
+  Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = PEIM_STATE_REGISTER_FOR_SHADOW;\r
 \r
   return EFI_SUCCESS;\r
 }\r