]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
MdeModulePkg/Core/Pei: fix REGISITER -> REGISTER typo
[mirror_edk2.git] / MdeModulePkg / Core / Pei / Dispatcher / Dispatcher.c
index 900e1d2d5040a396703c288cb89fed8a1ca1b2b3..027176d872c76e3a4c3b404b0ad9c992869d6f2e 100644 (file)
@@ -1,7 +1,9 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+/** @file\r
+  EFI PEI Core dispatch services\r
+  \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
 http://opensource.org/licenses/bsd-license.php\r
@@ -9,558 +11,1335 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-Module Name:\r
-\r
-  Dispatcher.c\r
+**/\r
 \r
-Abstract:\r
+#include "PeiMain.h"\r
 \r
-  EFI PEI Core dispatch services\r
-\r
-Revision History\r
+/**\r
 \r
---*/\r
+  Discover all Peims and optional Apriori file in one FV. There is at most one\r
+  Apriori file in one FV.\r
 \r
-#include <PeiMain.h>\r
 \r
-STATIC\r
-VOID *\r
-TransferOldDataToNewDataRange (\r
-  IN PEI_CORE_INSTANCE        *PrivateData\r
-  );\r
+  @param Private          Pointer to the private data passed in from caller\r
+  @param CoreFileHandle   The instance of PEI_CORE_FV_HANDLE.\r
 \r
-STATIC\r
+**/\r
 VOID\r
-InvokePeiCore (\r
-  VOID          *Context1,\r
-  VOID          *Context2\r
-  );\r
-\r
-EFI_STATUS\r
-PeiDispatcher (\r
-  IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
-  IN PEI_CORE_INSTANCE           *PrivateData,\r
-  IN PEI_CORE_DISPATCH_DATA      *DispatchData\r
+DiscoverPeimsAndOrderWithApriori (\r
+  IN  PEI_CORE_INSTANCE    *Private,\r
+  IN  PEI_CORE_FV_HANDLE   *CoreFileHandle\r
   )\r
-\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Conduct PEIM dispatch.\r
-\r
-Arguments:\r
-\r
-  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
-  PrivateData          - Pointer to the private data passed in from caller\r
-  DispatchData         - Pointer to PEI_CORE_DISPATCH_DATA data.\r
-\r
-Returns:\r
-\r
-  EFI_SUCCESS   - Successfully dispatched PEIM.\r
-  EFI_NOT_FOUND - The dispatch failed.\r
-\r
---*/\r
 {\r
-  EFI_STATUS                        Status;\r
-  PEI_CORE_TEMP_POINTERS            TempPtr;\r
-  BOOLEAN                           NextFvFound;\r
-  EFI_FIRMWARE_VOLUME_HEADER        *NextFvAddress;\r
-  EFI_FIRMWARE_VOLUME_HEADER        *DefaultFvAddress;\r
-  VOID                              *TopOfStack;\r
-  PEI_CORE_PARAMETERS               PeiCoreParameters;\r
+  EFI_STATUS                          Status;\r
+  EFI_PEI_FILE_HANDLE                 FileHandle;\r
+  EFI_PEI_FILE_HANDLE                 AprioriFileHandle;\r
+  EFI_GUID                            *Apriori;\r
+  UINTN                               Index;\r
+  UINTN                               Index2;\r
+  UINTN                               PeimIndex;\r
+  UINTN                               PeimCount;\r
+  EFI_GUID                            *Guid;\r
+  EFI_PEI_FILE_HANDLE                 *TempFileHandles;\r
+  EFI_GUID                            *FileGuid;\r
+  EFI_PEI_FIRMWARE_VOLUME_PPI         *FvPpi;\r
+  EFI_FV_FILE_INFO                    FileInfo;\r
+  \r
+  FvPpi = CoreFileHandle->FvPpi;\r
+  \r
+  //\r
+  // Walk the FV and find all the PEIMs and the Apriori file.\r
+  //\r
+  AprioriFileHandle = NULL;\r
+  Private->CurrentFvFileHandles[0] = NULL;\r
+  Guid = NULL;\r
+  FileHandle = NULL;\r
+  TempFileHandles = Private->FileHandles;\r
+  FileGuid        = Private->FileGuid;\r
+\r
+  //\r
+  // If the current Fv has been scanned, directly get its cachable record.\r
+  //\r
+  if (Private->Fv[Private->CurrentPeimFvCount].ScanFv) {\r
+    CopyMem (Private->CurrentFvFileHandles, Private->Fv[Private->CurrentPeimFvCount].FvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
+    return;\r
+  }\r
 \r
   //\r
-  // Debug data for uninstalled Peim list\r
+  // Go ahead to scan this Fv, and cache FileHandles within it.\r
   //\r
-  EFI_GUID                          DebugFoundPeimList[32];\r
-  EFI_DEVICE_HANDLE_EXTENDED_DATA   ExtendedData;\r
+  Status = EFI_NOT_FOUND;\r
+  for (PeimCount = 0; PeimCount <= PcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {\r
+    Status = FvPpi->FindFileByType (FvPpi, PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE, CoreFileHandle->FvHandle, &FileHandle);\r
+    if (Status != EFI_SUCCESS || PeimCount == PcdGet32 (PcdPeiCoreMaxPeimPerFv)) {\r
+      break;\r
+    }\r
+\r
+    Private->CurrentFvFileHandles[PeimCount] = FileHandle;\r
+  }\r
 \r
   //\r
-  // save the Current FV Address so that we will not process it again if FindFv returns it later\r
+  // Check whether the count of files exceeds the max support files in a FV image\r
+  // If more files are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.\r
   //\r
-  DefaultFvAddress = DispatchData->BootFvAddress;\r
+  ASSERT ((Status != EFI_SUCCESS) || (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)));\r
 \r
   //\r
-  // This is the main dispatch loop.  It will search known FVs for PEIMs and\r
-  // attempt to dispatch them.  If any PEIM gets dispatched through a single\r
-  // pass of the dispatcher, it will start over from the Bfv again to see\r
-  // if any new PEIMs dependencies got satisfied.  With a well ordered\r
-  // FV where PEIMs are found in the order their dependencies are also\r
-  // satisfied, this dipatcher should run only once.\r
+  // Get Apriori File handle\r
   //\r
-  for (;;) {\r
+  Private->AprioriCount = 0;\r
+  Status = FvPpi->FindFileByName (FvPpi, &gPeiAprioriFileNameGuid, &CoreFileHandle->FvHandle, &AprioriFileHandle);\r
+  if (!EFI_ERROR(Status) && AprioriFileHandle != NULL) {\r
     //\r
-    // This is the PEIM search loop. It will scan through all PEIMs it can find\r
-    // looking for PEIMs to dispatch, and will dipatch them if they have not\r
-    // already been dispatched and all of their dependencies are met.\r
-    // If no more PEIMs can be found in this pass through all known FVs,\r
-    // then it will break out of this loop.\r
+    // Read the Apriori file\r
     //\r
-    for (;;) {\r
-\r
-      Status = FindNextPeim (\r
-                 &PrivateData->PS,\r
-                 DispatchData->CurrentFvAddress,\r
-                 &DispatchData->CurrentPeimAddress\r
-                 );\r
-\r
+    Status = FvPpi->FindSectionByType (FvPpi, EFI_SECTION_RAW, AprioriFileHandle, (VOID **) &Apriori);\r
+    if (!EFI_ERROR (Status)) {\r
       //\r
-      // If we found a PEIM, check if it is dispatched.  If so, go to the\r
-      // next PEIM.  If not, dispatch it if its dependencies are satisfied.\r
-      // If its dependencies are not satisfied, go to the next PEIM.\r
+      // Calculate the number of PEIMs in the A Priori list\r
       //\r
-      if (Status == EFI_SUCCESS) {\r
-\r
-        DEBUG_CODE_BEGIN ();\r
-\r
-          //\r
-          // Fill list of found Peims for later list of those not installed\r
-          //\r
-          CopyMem (\r
-            &DebugFoundPeimList[DispatchData->CurrentPeim],\r
-            &DispatchData->CurrentPeimAddress->Name,\r
-            sizeof (EFI_GUID)\r
-            );\r
-\r
-        DEBUG_CODE_END ();\r
-\r
-        if (!Dispatched (\r
-               DispatchData->CurrentPeim,\r
-               DispatchData->DispatchedPeimBitMap\r
-               )) {\r
-          if (DepexSatisfied (&PrivateData->PS, DispatchData->CurrentPeimAddress)) {\r
-            Status = PeiLoadImage (\r
-                       &PrivateData->PS,\r
-                       DispatchData->CurrentPeimAddress,\r
-                       &TempPtr.Raw\r
-                       );\r
-            if (Status == EFI_SUCCESS) {\r
+      Status = FvPpi->GetFileInfo (FvPpi, AprioriFileHandle, &FileInfo);\r
+      ASSERT_EFI_ERROR (Status);\r
+      Private->AprioriCount = FileInfo.BufferSize;\r
+      if (IS_SECTION2 (FileInfo.Buffer)) {\r
+        Private->AprioriCount -= sizeof (EFI_COMMON_SECTION_HEADER2);\r
+      } else {\r
+        Private->AprioriCount -= sizeof (EFI_COMMON_SECTION_HEADER);\r
+      }\r
+      Private->AprioriCount /= sizeof (EFI_GUID);\r
 \r
-              //\r
-              // The PEIM has its dependencies satisfied, and its entry point\r
-              // has been found, so invoke it.\r
-              //\r
-              PERF_START (\r
-                (VOID *) (UINTN) (DispatchData->CurrentPeimAddress),\r
-                "PEIM",\r
-                NULL,\r
-                0\r
-                );\r
+      for (Index = 0; Index < PeimCount; Index++) {\r
+        //\r
+        // Make an array of file name guids that matches the FileHandle array so we can convert\r
+        // quickly from file name to file handle\r
+        //\r
+        Status = FvPpi->GetFileInfo (FvPpi, Private->CurrentFvFileHandles[Index], &FileInfo);\r
+        CopyMem (&FileGuid[Index], &FileInfo.FileName, sizeof(EFI_GUID));\r
+      }\r
 \r
-              //\r
-              // BUGBUG: Used to be EFI_PEI_REPORT_STATUS_CODE_CODE\r
-              //\r
-              ExtendedData.Handle = (EFI_HANDLE)DispatchData->CurrentPeimAddress;\r
+      //\r
+      // Walk through FileGuid array to find out who is invalid PEIM guid in Apriori file.\r
+      // Add available PEIMs in Apriori file into TempFileHandles array at first.\r
+      //\r
+      Index2 = 0;\r
+      for (Index = 0; Index2 < Private->AprioriCount; Index++) {\r
+        while (Index2 < Private->AprioriCount) {\r
+          Guid = ScanGuid (FileGuid, PeimCount * sizeof (EFI_GUID), &Apriori[Index2++]);\r
+          if (Guid != NULL) {\r
+            break;\r
+          }\r
+        }\r
+        if (Guid == NULL) {\r
+          break;\r
+        }\r
+        PeimIndex = ((UINTN)Guid - (UINTN)&FileGuid[0])/sizeof (EFI_GUID);\r
+        TempFileHandles[Index] = Private->CurrentFvFileHandles[PeimIndex];\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
-                );\r
+        //\r
+        // Since we have copied the file handle we can remove it from this list.\r
+        //\r
+        Private->CurrentFvFileHandles[PeimIndex] = NULL;\r
+      }\r
 \r
-              //\r
-              // Is this a authentic image\r
-              //\r
-              Status = VerifyPeim (\r
-                        &PrivateData->PS,\r
-                        DispatchData->CurrentPeimAddress\r
-                        );\r
+      //\r
+      // Update valid Aprioricount\r
+      //\r
+      Private->AprioriCount = Index;\r
 \r
-              if (Status != EFI_SECURITY_VIOLATION) {\r
+      //\r
+      // Add in any PEIMs not in the Apriori file\r
+      //\r
+      for (;Index < PeimCount; Index++) {\r
+        for (Index2 = 0; Index2 < PeimCount; Index2++) {\r
+          if (Private->CurrentFvFileHandles[Index2] != NULL) {\r
+            TempFileHandles[Index] = Private->CurrentFvFileHandles[Index2];\r
+            Private->CurrentFvFileHandles[Index2] = NULL;\r
+            break;\r
+          }\r
+        }\r
+      }\r
+      //\r
+      //Index the end of array contains re-range Pei moudle.\r
+      //\r
+      TempFileHandles[Index] = NULL;\r
 \r
-                //\r
-                // BUGBUG: Before enable PI, we need cast EFI_FFS_FILE_HEADER* to EFI_PEI_FILE_HANDLE*\r
-                //         Because we use new MdePkg's definition, but they are binary compatible in fact.\r
-                //\r
-                Status =  TempPtr.PeimEntry (\r
-                                    (EFI_PEI_FILE_HANDLE*)DispatchData->CurrentPeimAddress,\r
-                                    &PrivateData->PS\r
-                                    );\r
-              }\r
+      //\r
+      // Private->CurrentFvFileHandles is currently in PEIM in the FV order.\r
+      // We need to update it to start with files in the A Priori list and\r
+      // then the remaining files in PEIM order.\r
+      //\r
+      CopyMem (Private->CurrentFvFileHandles, TempFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
+    }\r
+  }\r
+  //\r
+  // Cache the current Fv File Handle. So that we don't have to scan the Fv again.\r
+  // Instead, we can retrieve the file handles within this Fv from cachable data.\r
+  //\r
+  Private->Fv[Private->CurrentPeimFvCount].ScanFv = TRUE;\r
+  CopyMem (Private->Fv[Private->CurrentPeimFvCount].FvFileHandles, Private->CurrentFvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\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
-                );\r
+}\r
 \r
-              PERF_END ((VOID *) (UINTN) (DispatchData->CurrentPeimAddress), "PEIM", NULL, 0);\r
+//\r
+// This is the minimum memory required by DxeCore initialization. When LMFA feature enabled,\r
+// This part of memory still need reserved on the very top of memory so that the DXE Core could  \r
+// use these memory for data initialization. This macro should be sync with the same marco\r
+// defined in DXE Core.\r
+//\r
+#define MINIMUM_INITIAL_MEMORY_SIZE 0x10000\r
+/**\r
+  This function is to test if the memory range described in resource HOB is available or not. \r
+  \r
+  This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. Some platform may allocate the \r
+  memory before PeiLoadFixAddressHook in invoked. so this function is to test if the memory range described by the input resource HOB is\r
+  available or not.\r
 \r
-              //\r
-              // Mark the PEIM as dispatched so we don't attempt to run it again\r
-              //\r
-              SetDispatched (\r
-                &PrivateData->PS,\r
-                DispatchData->CurrentPeim,\r
-                &DispatchData->DispatchedPeimBitMap\r
-                );\r
+  @param PrivateData         Pointer to the private data passed in from caller\r
+  @param ResourceHob         Pointer to a resource HOB which described the memory range described by the input resource HOB\r
+**/\r
+BOOLEAN\r
+PeiLoadFixAddressIsMemoryRangeAvailable (\r
+  IN PEI_CORE_INSTANCE                  *PrivateData,\r
+  IN EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob\r
+  )\r
+{\r
+       EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;\r
+       BOOLEAN                             IsAvailable;\r
+       EFI_PEI_HOB_POINTERS                Hob;\r
+       \r
+  IsAvailable = TRUE;\r
+       if (PrivateData == NULL || ResourceHob == NULL) {\r
+         return FALSE;\r
+       }\r
+       //\r
+  // test if the memory range describe in the HOB is already allocated.\r
+  //\r
+  for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+    //                                                              \r
+    // See if this is a memory allocation HOB                     \r
+    //\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) { \r
+      MemoryHob = Hob.MemoryAllocation;\r
+      if(MemoryHob->AllocDescriptor.MemoryBaseAddress == ResourceHob->PhysicalStart && \r
+         MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength == ResourceHob->PhysicalStart + ResourceHob->ResourceLength) {\r
+         IsAvailable = FALSE;\r
+         break;  \r
+       }\r
+     }\r
+  }\r
+  \r
+  return IsAvailable;\r
+       \r
+}\r
+/**\r
+  Hook function for Loading Module at Fixed Address feature\r
+  \r
+  This function should only be invoked when Loading Module at Fixed Address(LMFA) feature is enabled. When feature is\r
+  configured as Load Modules at Fix Absolute Address, this function is to validate the top address assigned by user. When \r
+  feature is configured as Load Modules at Fixed Offset, the functino is to find the top address which is TOLM-TSEG in general.  \r
+  And also the function will re-install PEI memory. \r
 \r
-              //\r
-              // Process the Notify list and dispatch any notifies for\r
-              // newly installed PPIs.\r
-              //\r
-              ProcessNotifyList (&PrivateData->PS);\r
+  @param PrivateData         Pointer to the private data passed in from caller\r
 \r
+**/\r
+VOID\r
+PeiLoadFixAddressHook(\r
+  IN PEI_CORE_INSTANCE           *PrivateData\r
+  )\r
+{\r
+  EFI_PHYSICAL_ADDRESS               TopLoadingAddress;\r
+  UINT64                             PeiMemorySize;\r
+  UINT64                             TotalReservedMemorySize;\r
+  UINT64                             MemoryRangeEnd;\r
+  EFI_PHYSICAL_ADDRESS               HighAddress; \r
+  EFI_HOB_RESOURCE_DESCRIPTOR        *ResourceHob;\r
+  EFI_HOB_RESOURCE_DESCRIPTOR        *NextResourceHob;\r
+  EFI_HOB_RESOURCE_DESCRIPTOR        *CurrentResourceHob;\r
+  EFI_PEI_HOB_POINTERS               CurrentHob;\r
+  EFI_PEI_HOB_POINTERS               Hob;\r
+  EFI_PEI_HOB_POINTERS               NextHob;\r
+  EFI_HOB_MEMORY_ALLOCATION          *MemoryHob;\r
+  //\r
+  // Initialize Local Variables\r
+  //\r
+  CurrentResourceHob    = NULL;\r
+  ResourceHob           = NULL;\r
+  NextResourceHob       = NULL;\r
+  HighAddress           = 0;\r
+  TopLoadingAddress     = 0;\r
+  MemoryRangeEnd      = 0;\r
+  CurrentHob.Raw      = PrivateData->HobList.Raw;\r
+  PeiMemorySize = PrivateData->PhysicalMemoryLength;\r
+  //\r
+  // The top reserved memory include 3 parts: the topest range is for DXE core initialization with the size  MINIMUM_INITIAL_MEMORY_SIZE\r
+  // then RuntimeCodePage range and Boot time code range.\r
+  //  \r
+  TotalReservedMemorySize = MINIMUM_INITIAL_MEMORY_SIZE + EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber));\r
+  TotalReservedMemorySize+= EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)) ;  \r
+  //\r
+  // PEI memory range lies below the top reserved memory\r
+  // \r
+  TotalReservedMemorySize += PeiMemorySize;\r
+  \r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressRuntimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber)));\r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressBootTimeCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)));\r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressPeiCodePageNumber= 0x%x.\n", PcdGet32(PcdLoadFixAddressPeiCodePageNumber)));   \r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Total Reserved Memory Size = 0x%lx.\n", TotalReservedMemorySize));\r
+  //\r
+  // Loop through the system memory typed hob to merge the adjacent memory range \r
+  //\r
+  for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+    //                                                              \r
+    // See if this is a resource descriptor HOB                     \r
+    //\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+      \r
+      ResourceHob = Hob.ResourceDescriptor;  \r
+      //\r
+      // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
+      //\r
+      if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||\r
+          ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS)   {\r
+        continue;\r
+      }   \r
+      \r
+      for (NextHob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(NextHob); NextHob.Raw = GET_NEXT_HOB(NextHob)) {       \r
+        if (NextHob.Raw == Hob.Raw){\r
+          continue;\r
+        }  \r
+        //\r
+        // See if this is a resource descriptor HOB\r
+        //\r
+        if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+      \r
+          NextResourceHob = NextHob.ResourceDescriptor;\r
+          //\r
+          // test if range described in this NextResourceHob is system memory and have the same attribute.\r
+          // Note: Here is a assumption that system memory should always be healthy even without test.\r
+          //    \r
+          if (NextResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
+             (((NextResourceHob->ResourceAttribute^ResourceHob->ResourceAttribute)&(~EFI_RESOURCE_ATTRIBUTE_TESTED)) == 0)){\r
+              \r
               //\r
-              // If real system memory was discovered and installed by this\r
-              // PEIM, switch the stacks to the new memory.  Since we are\r
-              // at dispatch level, only the Core's private data is preserved,\r
-              // nobody else should have any data on the stack.\r
+              // See if the memory range described in ResourceHob and NextResourceHob is adjacent\r
               //\r
-              if (PrivateData->SwitchStackSignal) {\r
+              if ((ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart && \r
+                    ResourceHob->PhysicalStart + ResourceHob->ResourceLength >= NextResourceHob->PhysicalStart)|| \r
+                  (ResourceHob->PhysicalStart >= NextResourceHob->PhysicalStart&&\r
+                     ResourceHob->PhysicalStart <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) {\r
+             \r
+                MemoryRangeEnd = ((ResourceHob->PhysicalStart + ResourceHob->ResourceLength)>(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength)) ?\r
+                                     (ResourceHob->PhysicalStart + ResourceHob->ResourceLength):(NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength);\r
+          \r
+                ResourceHob->PhysicalStart = (ResourceHob->PhysicalStart < NextResourceHob->PhysicalStart) ? \r
+                                                    ResourceHob->PhysicalStart : NextResourceHob->PhysicalStart;\r
+                \r
+               \r
+                ResourceHob->ResourceLength = (MemoryRangeEnd - ResourceHob->PhysicalStart);\r
+                \r
+                ResourceHob->ResourceAttribute = ResourceHob->ResourceAttribute & (~EFI_RESOURCE_ATTRIBUTE_TESTED);\r
                 //\r
-                // Adjust the top of stack to be aligned at CPU_STACK_ALIGNMENT\r
+                // Delete the NextResourceHob by marking it as unused.\r
                 //\r
-                TopOfStack = (VOID *)((UINTN)PrivateData->StackBase + (UINTN)PrivateData->StackSize - CPU_STACK_ALIGNMENT);\r
-                TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);\r
+                GET_HOB_TYPE (NextHob) = EFI_HOB_TYPE_UNUSED;\r
                 \r
-                PeiCoreParameters.SecCoreData = SecCoreData;\r
-                PeiCoreParameters.PpiList     = NULL;\r
-                PeiCoreParameters.Data        = TransferOldDataToNewDataRange (PrivateData);\r
-                ASSERT (PeiCoreParameters.Data != 0);\r
-\r
-                PeiSwitchStacks (\r
-                  InvokePeiCore,\r
-                  (VOID*) (UINTN) PeiCore,\r
-                  (VOID*) &PeiCoreParameters,  \r
-                  TopOfStack,\r
-                  (VOID*)(UINTN)PrivateData->StackBase\r
-                  );\r
               }\r
-            }\r
-          }\r
-        }\r
-        DispatchData->CurrentPeim++;\r
-        continue;\r
-\r
-      } else {\r
-\r
+           }\r
+        } \r
+      }\r
+    } \r
+  }\r
+  //\r
+  // Some platform is already allocated pages before the HOB re-org. Here to build dedicated resource HOB to describe\r
+  //  the allocated memory range\r
+  //\r
+  for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+    //                                                              \r
+    // See if this is a memory allocation HOB                     \r
+    //\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
+      MemoryHob = Hob.MemoryAllocation;\r
+      for (NextHob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(NextHob); NextHob.Raw = GET_NEXT_HOB(NextHob)) {\r
         //\r
-        // If we could not find another PEIM in the current FV, go try\r
-        // the FindFv PPI to look in other FVs for more PEIMs.  If we can\r
-        // not locate the FindFv PPI, or if the FindFv PPI can not find\r
-        // anymore FVs, then exit the PEIM search loop.\r
+        // See if this is a resource descriptor HOB\r
         //\r
-        if (DispatchData->FindFv == NULL) {\r
-          Status = PeiServicesLocatePpi (\r
-                     &gEfiFindFvPpiGuid,\r
-                     0,\r
-                     NULL,\r
-                     (VOID **)&DispatchData->FindFv\r
-                     );\r
-          if (Status != EFI_SUCCESS) {\r
-            break;\r
-          }\r
-        }\r
-        NextFvFound = FALSE;\r
-        while (!NextFvFound) {\r
-          Status = DispatchData->FindFv->FindFv (\r
-                                           DispatchData->FindFv,\r
-                                           &PrivateData->PS,\r
-                                           &DispatchData->CurrentFv,\r
-                                           &NextFvAddress\r
-                                           );\r
+        if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+               NextResourceHob = NextHob.ResourceDescriptor;\r
           //\r
-          // if there is no next fv, get out of this loop of finding FVs\r
+          // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
           //\r
-          if (Status != EFI_SUCCESS) {\r
-            break;\r
+          if (NextResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) {\r
+            continue;\r
           }\r
           //\r
-          // don't process the default Fv again. (we don't know the order in which the hobs were created)\r
-          //\r
-          if ((NextFvAddress != DefaultFvAddress) &&\r
-              (NextFvAddress != DispatchData->CurrentFvAddress)) {\r
+          // If the range describe in memory allocation HOB  belongs to the memroy range described by the resource hob\r
+          //          \r
+          if (MemoryHob->AllocDescriptor.MemoryBaseAddress >= NextResourceHob->PhysicalStart && \r
+              MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength <= NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
+             //\r
+             // Build seperate resource hob for this allocated range\r
+             //                     \r
+             if (MemoryHob->AllocDescriptor.MemoryBaseAddress > NextResourceHob->PhysicalStart) {\r
+               BuildResourceDescriptorHob (\r
+                 EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+                 NextResourceHob->ResourceAttribute,\r
+                 NextResourceHob->PhysicalStart,                             \r
+                 (MemoryHob->AllocDescriptor.MemoryBaseAddress - NextResourceHob->PhysicalStart)      \r
+               );\r
+             }\r
+             if (MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength < NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength) {\r
+               BuildResourceDescriptorHob (\r
+                 EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+                 NextResourceHob->ResourceAttribute,\r
+                 MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength,                            \r
+                 (NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength -(MemoryHob->AllocDescriptor.MemoryBaseAddress + MemoryHob->AllocDescriptor.MemoryLength))    \r
+               );\r
+             }\r
+             NextResourceHob->PhysicalStart = MemoryHob->AllocDescriptor.MemoryBaseAddress;\r
+             NextResourceHob->ResourceLength = MemoryHob->AllocDescriptor.MemoryLength;\r
+             break;\r
+          }\r
+        }\r
+      }\r
+    }\r
+  }\r
 \r
+  //\r
+  // Try to find and validate the TOP address.\r
+  //  \r
+  if ((INT64)PcdGet64(PcdLoadModuleAtFixAddressEnable) > 0 ) {\r
+    //\r
+    // The LMFA feature is enabled as load module at fixed absolute address.\r
+    //\r
+    TopLoadingAddress = (EFI_PHYSICAL_ADDRESS)PcdGet64(PcdLoadModuleAtFixAddressEnable);\r
+    DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Loading module at fixed absolute address.\n"));\r
+    //\r
+    // validate the Address. Loop the resource descriptor HOB to make sure the address is in valid memory range\r
+    //\r
+    if ((TopLoadingAddress & EFI_PAGE_MASK) != 0) {\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid since top address should be page align. \n", TopLoadingAddress)); \r
+      ASSERT (FALSE);    \r
+    }\r
+    //\r
+    // Search for a memory region that is below MAX_ADDRESS and in which TopLoadingAddress lies \r
+    //\r
+    for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      //\r
+      // See if this is a resource descriptor HOB\r
+      //\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+\r
+        ResourceHob = Hob.ResourceDescriptor;\r
+        //\r
+        // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
+        //    \r
+        if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
+            ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
             //\r
-            // VerifyFv() is currently returns SUCCESS all the time, add code to it to\r
-            // actually verify the given FV\r
+            // See if Top address specified by user is valid.\r
             //\r
-            Status = VerifyFv (NextFvAddress);\r
-            if (Status == EFI_SUCCESS) {\r
-              NextFvFound = TRUE;\r
-              DispatchData->CurrentFvAddress = NextFvAddress;\r
-              DispatchData->CurrentPeimAddress = NULL;\r
+            if (ResourceHob->PhysicalStart + TotalReservedMemorySize < TopLoadingAddress && \r
+                (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - MINIMUM_INITIAL_MEMORY_SIZE) >= TopLoadingAddress && \r
+                PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
+              CurrentResourceHob = ResourceHob; \r
+              CurrentHob = Hob;\r
+              break;\r
+           }\r
+        }\r
+      }  \r
+    }  \r
+    if (CurrentResourceHob != NULL) {\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO:Top Address 0x%lx is valid \n",  TopLoadingAddress));\r
+      TopLoadingAddress += MINIMUM_INITIAL_MEMORY_SIZE; \r
+    } else {\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is invalid \n",  TopLoadingAddress)); \r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The recommended Top Address for the platform is: \n")); \r
+      //\r
+      // Print the recomended Top address range.\r
+      // \r
+      for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+        //\r
+        // See if this is a resource descriptor HOB\r
+        //\r
+        if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+        \r
+          ResourceHob = Hob.ResourceDescriptor;\r
+          //\r
+          // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
+          //    \r
+          if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&\r
+              ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS) {\r
               //\r
-              // current PRIM number (CurrentPeim) must continue as is, don't reset it here\r
+              // See if Top address specified by user is valid.\r
               //\r
-            }\r
+              if (ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
+                 DEBUG ((EFI_D_INFO, "(0x%lx, 0x%lx)\n",  \r
+                          (ResourceHob->PhysicalStart + TotalReservedMemorySize -MINIMUM_INITIAL_MEMORY_SIZE), \r
+                          (ResourceHob->PhysicalStart + ResourceHob->ResourceLength -MINIMUM_INITIAL_MEMORY_SIZE) \r
+                        )); \r
+              }\r
           }\r
         }\r
+      }  \r
+      //\r
+      // Assert here \r
+      //\r
+      ASSERT (FALSE);   \r
+      return;   \r
+    }     \r
+  } else {\r
+    //\r
+    // The LMFA feature is enabled as load module at fixed offset relative to TOLM\r
+    // Parse the Hob list to find the topest available memory. Generally it is (TOLM - TSEG)\r
+    //\r
+    //\r
+    // Search for a tested memory region that is below MAX_ADDRESS\r
+    //\r
+    for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      //\r
+      // See if this is a resource descriptor HOB \r
+      //\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+        \r
+        ResourceHob = Hob.ResourceDescriptor;                                                                                                                                                                                                                               \r
         //\r
-        // if there is no next fv, get out of this loop of dispatching PEIMs\r
+        // See if this resource descrior HOB describes tested system memory below MAX_ADDRESS\r
         //\r
-        if (!NextFvFound) {\r
-          break;\r
+        if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY && \r
+            ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS &&\r
+            ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
+          //\r
+          // See if this is the highest largest system memory region below MaxAddress\r
+          //\r
+          if (ResourceHob->PhysicalStart > HighAddress) {\r
+             CurrentResourceHob = ResourceHob;\r
+             CurrentHob = Hob;\r
+             HighAddress = CurrentResourceHob->PhysicalStart;\r
+          }\r
         }\r
-        //\r
-        // continue in the inner for(;;) loop with a new FV;\r
-        //\r
-      }\r
+      }  \r
     }\r
-\r
+    if (CurrentResourceHob == NULL) {\r
+      DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The System Memory is too small\n")); \r
+      //\r
+      // Assert here \r
+      //\r
+      ASSERT (FALSE);\r
+      return;  \r
+    } else {\r
+      TopLoadingAddress = CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength ; \r
+    }         \r
+  }\r
+  \r
+  if (CurrentResourceHob != NULL) {\r
     //\r
-    // If all the PEIMs that we have found have been dispatched, then\r
-    // there is nothing left to dispatch and we don't need to go search\r
-    // through all PEIMs again.\r
+    // rebuild resource HOB for PEI memmory and reserved memory\r
     //\r
-    if ((~(DispatchData->DispatchedPeimBitMap) &\r
-         ((1 << DispatchData->CurrentPeim)-1)) == 0) {\r
-      break;\r
+    BuildResourceDescriptorHob (\r
+      EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+      (\r
+      EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+      EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+      EFI_RESOURCE_ATTRIBUTE_TESTED |\r
+      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+      EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+      EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+      EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
+      ),\r
+      (TopLoadingAddress - TotalReservedMemorySize),                             \r
+      TotalReservedMemorySize     \r
+    );\r
+    //\r
+    // rebuild resource for the remain memory if necessary\r
+    //\r
+    if (CurrentResourceHob->PhysicalStart < TopLoadingAddress - TotalReservedMemorySize) {\r
+      BuildResourceDescriptorHob (\r
+        EFI_RESOURCE_SYSTEM_MEMORY,                       \r
+        (\r
+         EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+         EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+         EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
+         ),\r
+         CurrentResourceHob->PhysicalStart,                             \r
+         (TopLoadingAddress - TotalReservedMemorySize - CurrentResourceHob->PhysicalStart)      \r
+       );\r
+    }\r
+    if (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  > TopLoadingAddress ) {\r
+      BuildResourceDescriptorHob (\r
+        EFI_RESOURCE_SYSTEM_MEMORY,                     \r
+        (\r
+         EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
+         EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
+         EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
+         EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
+         ),\r
+         TopLoadingAddress,                            \r
+         (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength  - TopLoadingAddress)     \r
+       );\r
     }\r
+    //\r
+    // Delete CurrentHob by marking it as unused since the the memory range described by is rebuilt.\r
+    //\r
+    GET_HOB_TYPE (CurrentHob) = EFI_HOB_TYPE_UNUSED;         \r
+  }\r
+\r
+  //\r
+  // Cache the top address for Loading Module at Fixed Address feature\r
+  //\r
+  PrivateData->LoadModuleAtFixAddressTopAddress = TopLoadingAddress - MINIMUM_INITIAL_MEMORY_SIZE;\r
+  DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Top address = 0x%lx\n",  PrivateData->LoadModuleAtFixAddressTopAddress)); \r
+  //\r
+  // reinstall the PEI memory relative to TopLoadingAddress\r
+  //\r
+  PrivateData->PhysicalMemoryBegin   = TopLoadingAddress - TotalReservedMemorySize;\r
+  PrivateData->FreePhysicalMemoryTop = PrivateData->PhysicalMemoryBegin + PeiMemorySize;\r
+}\r
 \r
+/**\r
+  This routine is invoked in switch stack as PeiCore Entry.\r
+\r
+  @param 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 Private         Pointer to old core data that is used to initialize the\r
+                         core's data areas.\r
+**/\r
+VOID\r
+EFIAPI\r
+PeiCoreEntry (\r
+  IN CONST EFI_SEC_PEI_HAND_OFF    *SecCoreData,\r
+  IN PEI_CORE_INSTANCE             *Private\r
+  )\r
+{\r
+  //\r
+  // Entry PEI Phase 2\r
+  //\r
+  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
-    // Check if no more PEIMs that depex was satisfied\r
+    // Before switch stack from temporary memory to permanent memory, calculate the heap and stack\r
+    // usage in temporary memory for debugging.\r
     //\r
-    if (DispatchData->DispatchedPeimBitMap == DispatchData->PreviousPeimBitMap) {\r
-      break;\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
-    // Case when Depex is not satisfied and has to traverse the list again\r
+    // Reserve the size of new stack at bottom of physical memory\r
     //\r
-    DispatchData->CurrentPeim = 0;\r
-    DispatchData->CurrentPeimAddress = 0;\r
-    DispatchData->PreviousPeimBitMap = DispatchData->DispatchedPeimBitMap;\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
-    // don't go back to the loop without making sure that the CurrentFvAddress is the\r
-    // same as the 1st (or default) FV we started with. otherwise we will interpret the bimap wrongly and\r
-    // mess it up, always start processing the PEIMs from the default FV just like in the first time around.\r
+    // Calculate stack offset and heap offset between temporary memory and new permement \r
+    // memory seperately.\r
     //\r
-    DispatchData->CurrentFv = 0;\r
-    DispatchData->CurrentFvAddress = DefaultFvAddress;\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
-  DEBUG_CODE_BEGIN ();\r
     //\r
-    // Debug data for uninstalled Peim list\r
+    // Build Stack HOB that describes the permanent memory stack\r
     //\r
-    UINT32        DebugNotDispatchedBitmap;\r
-    UINT8         DebugFoundPeimPoint;\r
+    DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n", TopOfNewStack - NewStackSize, NewStackSize));\r
+    BuildStackHob (TopOfNewStack - NewStackSize, NewStackSize);\r
 \r
-    DebugFoundPeimPoint = 0;\r
     //\r
-    // Get bitmap of Peims that were not dispatched,\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
-    DebugNotDispatchedBitmap = ((DispatchData->DispatchedPeimBitMap) ^ ((1 << DispatchData->CurrentPeim)-1));\r
     //\r
-    // Scan bitmap of Peims not installed and print GUIDS\r
+    // TemporaryRamSupportPpi is produced by platform's SEC\r
     //\r
-    while (DebugNotDispatchedBitmap != 0) {\r
-      if ((DebugNotDispatchedBitmap & 1) != 0) {\r
-        DEBUG ((EFI_D_INFO, "WARNING -> InstallPpi: Not Installed: %g\n",\r
-           &DebugFoundPeimList[DebugFoundPeimPoint]\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
-      DebugFoundPeimPoint++;\r
-      DebugNotDispatchedBitmap >>= 1;\r
-    }\r
 \r
-  DEBUG_CODE_END ();\r
+      DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
 \r
-  return EFI_NOT_FOUND;\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
-VOID\r
-InitializeDispatcherData (\r
-  IN EFI_PEI_SERVICES             **PeiServices,\r
-  IN PEI_CORE_INSTANCE            *OldCoreData,\r
-  IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\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
-Routine Description:\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
-  Initialize the Dispatcher's data members\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
-Arguments:\r
+      //\r
+      // Migrate the PEI Services Table pointer from temporary RAM to permanent RAM.\r
+      //\r
+      MigratePeiServicesTablePointer ();\r
 \r
-  PeiServices          - The PEI core services table.\r
-  OldCoreData          - Pointer to old core data (before switching stack).\r
-                         NULL if being run in non-permament memory mode.\r
-  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
+      //\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
-Returns:\r
+      DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
 \r
-  None.\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
-{\r
-  PEI_CORE_INSTANCE *PrivateData;\r
+      //\r
+      // Migrate Stack\r
+      //\r
+      CopyMem ((UINT8 *) (UINTN) (TopOfNewStack - TemporaryStackSize), TemporaryStackBase, TemporaryStackSize);\r
 \r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\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
-  if (OldCoreData == NULL) {\r
-    PrivateData->DispatchData.CurrentFvAddress = (EFI_FIRMWARE_VOLUME_HEADER *) SecCoreData->BootFirmwareVolumeBase;\r
-    PrivateData->DispatchData.BootFvAddress = (EFI_FIRMWARE_VOLUME_HEADER *) SecCoreData->BootFirmwareVolumeBase;\r
-  } else {\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
-    // Current peim has been dispatched, but not count\r
+    // Code should not come here\r
     //\r
-    PrivateData->DispatchData.CurrentPeim = (UINT8)(OldCoreData->DispatchData.CurrentPeim + 1);\r
+    ASSERT (FALSE);\r
   }\r
-\r
-  return;\r
 }\r
 \r
+/**\r
+  Conduct PEIM dispatch.\r
+\r
+  @param 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 Private         Pointer to the private data passed in from caller\r
 \r
-BOOLEAN\r
-Dispatched (\r
-  IN UINT8  CurrentPeim,\r
-  IN UINT32 DispatchedPeimBitMap\r
+**/\r
+VOID\r
+PeiDispatcher (\r
+  IN CONST EFI_SEC_PEI_HAND_OFF  *SecCoreData,\r
+  IN PEI_CORE_INSTANCE           *Private\r
   )\r
-/*++\r
+{\r
+  EFI_STATUS                          Status;\r
+  UINT32                              Index1;\r
+  UINT32                              Index2;\r
+  CONST EFI_PEI_SERVICES              **PeiServices;\r
+  EFI_PEI_FILE_HANDLE                 PeimFileHandle;\r
+  UINTN                               FvCount;\r
+  UINTN                               PeimCount;\r
+  UINT32                              AuthenticationState;\r
+  EFI_PHYSICAL_ADDRESS                EntryPoint;\r
+  EFI_PEIM_ENTRY_POINT2               PeimEntryPoint;\r
+  UINTN                               SaveCurrentPeimCount;\r
+  UINTN                               SaveCurrentFvCount;\r
+  EFI_PEI_FILE_HANDLE                 SaveCurrentFileHandle;\r
+  EFI_FV_FILE_INFO                    FvFileInfo;\r
+  PEI_CORE_FV_HANDLE                  *CoreFvHandle;\r
+  \r
+  PeiServices = (CONST EFI_PEI_SERVICES **) &Private->Ps;\r
+  PeimEntryPoint = NULL;\r
+  PeimFileHandle = NULL;\r
+  EntryPoint     = 0;\r
 \r
-Routine Description:\r
+  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_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 (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {\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_REGISTER_FOR_SHADOW,\r
+                    &EntryPoint,\r
+                    &AuthenticationState\r
+                    );\r
+          if (Status == EFI_SUCCESS) {\r
+            //\r
+            // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE\r
+            //\r
+            Private->Fv[Index1].PeimState[Index2]++;\r
+            //\r
+            // Call the PEIM entry point\r
+            //\r
+            PeimEntryPoint = (EFI_PEIM_ENTRY_POINT2)(UINTN)EntryPoint;\r
 \r
-  This routine checks to see if a particular PEIM has been dispatched during\r
-  the PEI core dispatch.\r
+            PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
+            PeimEntryPoint(PeimFileHandle, (const EFI_PEI_SERVICES **) &Private->Ps);\r
+            PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
+          }\r
 \r
-Arguments:\r
-  CurrentPeim          - The PEIM/FV in the bit array to check.\r
-  DispatchedPeimBitMap - Bit array, each bit corresponds to a PEIM/FV.\r
+          //\r
+          // Process the Notify list and dispatch any notifies for\r
+          // newly installed PPIs.\r
+          //\r
+          ProcessNotifyList (Private);\r
+        }\r
+      }\r
+    }\r
+    Private->CurrentFileHandle  = SaveCurrentFileHandle;\r
+    Private->CurrentPeimFvCount = SaveCurrentFvCount;\r
+    Private->CurrentPeimCount   = SaveCurrentPeimCount;\r
+  }\r
 \r
-Returns:\r
-  TRUE  - PEIM already dispatched\r
-  FALSE - Otherwise\r
+  //\r
+  // This is the main dispatch loop.  It will search known FVs for PEIMs and\r
+  // attempt to dispatch them.  If any PEIM gets dispatched through a single\r
+  // pass of the dispatcher, it will start over from the Bfv again to see\r
+  // if any new PEIMs dependencies got satisfied.  With a well ordered\r
+  // FV where PEIMs are found in the order their dependencies are also\r
+  // satisfied, this dipatcher should run only once.\r
+  //\r
+  do {\r
+    //\r
+    // In case that reenter PeiCore happens, the last pass record is still available.   \r
+    //\r
+    if (!Private->PeimDispatcherReenter) {\r
+      Private->PeimNeedingDispatch      = FALSE;\r
+      Private->PeimDispatchOnThisPass   = FALSE;\r
+    } else {\r
+      Private->PeimDispatcherReenter    = FALSE;\r
+    }\r
+    \r
+    for (FvCount = Private->CurrentPeimFvCount; FvCount < Private->FvCount; FvCount++) {\r
+      CoreFvHandle = FindNextCoreFvHandle (Private, FvCount);\r
+      ASSERT (CoreFvHandle != NULL);\r
+      \r
+      //\r
+      // If the FV has corresponding EFI_PEI_FIRMWARE_VOLUME_PPI instance, then dispatch it.\r
+      //\r
+      if (CoreFvHandle->FvPpi == NULL) {\r
+        continue;\r
+      }\r
+      \r
+      Private->CurrentPeimFvCount = FvCount;\r
 \r
---*/\r
-{\r
-  return (BOOLEAN)((DispatchedPeimBitMap & (1 << CurrentPeim)) != 0);\r
-}\r
+      if (Private->CurrentPeimCount == 0) {\r
+        //\r
+        // When going through each FV, at first, search Apriori file to\r
+        // reorder all PEIMs to ensure the PEIMs in Apriori file to get\r
+        // dispatch at first.\r
+        //\r
+        DiscoverPeimsAndOrderWithApriori (Private, CoreFvHandle);\r
+      }\r
 \r
-VOID\r
-SetDispatched (\r
-  IN EFI_PEI_SERVICES   **PeiServices,\r
-  IN UINT8              CurrentPeim,\r
-  OUT UINT32            *DispatchedPeimBitMap\r
-  )\r
-/*++\r
+      //\r
+      // Start to dispatch all modules within the current Fv.\r
+      //\r
+      for (PeimCount = Private->CurrentPeimCount;\r
+           (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);\r
+           PeimCount++) {\r
+        Private->CurrentPeimCount  = PeimCount;\r
+        PeimFileHandle = Private->CurrentFileHandle = Private->CurrentFvFileHandles[PeimCount];\r
+\r
+        if (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_NOT_DISPATCHED) {\r
+          if (!DepexSatisfied (Private, PeimFileHandle, PeimCount)) {\r
+            Private->PeimNeedingDispatch = TRUE;\r
+          } else {\r
+            Status = CoreFvHandle->FvPpi->GetFileInfo (CoreFvHandle->FvPpi, PeimFileHandle, &FvFileInfo);\r
+            ASSERT_EFI_ERROR (Status);\r
+            if (FvFileInfo.FileType == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) {\r
+              //\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
+                //\r
+                // PEIM_STATE_NOT_DISPATCHED move to PEIM_STATE_DISPATCHED\r
+                //\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
+              // For PEIM driver, Load its entry point\r
+              //\r
+              Status = PeiLoadImage (\r
+                         PeiServices,\r
+                         PeimFileHandle,\r
+                         PEIM_STATE_NOT_DISPATCHED,\r
+                         &EntryPoint,\r
+                         &AuthenticationState\r
+                         );\r
+              if (Status == EFI_SUCCESS) {\r
+                //\r
+                // The PEIM has its dependencies satisfied, and its entry point\r
+                // has been found, so invoke it.\r
+                //\r
+                PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
+\r
+                REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
+                  EFI_PROGRESS_CODE,\r
+                  (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
+                  (VOID *)(&PeimFileHandle),\r
+                  sizeof (PeimFileHandle)\r
+                  );\r
 \r
-Routine Description:\r
+                Status = VerifyPeim (Private, CoreFvHandle->FvHandle, PeimFileHandle, AuthenticationState);\r
+                if (Status != EFI_SECURITY_VIOLATION) {\r
+                  //\r
+                  // PEIM_STATE_NOT_DISPATCHED move to PEIM_STATE_DISPATCHED\r
+                  //\r
+                  Private->Fv[FvCount].PeimState[PeimCount]++;\r
+                  //\r
+                  // Call the PEIM entry point for PEIM driver\r
+                  //\r
+                  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 *)(&PeimFileHandle),\r
+                  sizeof (PeimFileHandle)\r
+                  );\r
+                PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
 \r
-  This routine sets a PEIM as having been dispatched once its entry\r
-  point has been invoked.\r
+              }\r
+            }\r
 \r
-Arguments:\r
+            PeiCheckAndSwitchStack (SecCoreData, Private);\r
 \r
-  PeiServices          - The PEI core services table.\r
-  CurrentPeim          - The PEIM/FV in the bit array to check.\r
-  DispatchedPeimBitMap - Bit array, each bit corresponds to a PEIM/FV.\r
+            //\r
+            // Process the Notify list and dispatch any notifies for\r
+            // newly installed PPIs.\r
+            //\r
+            ProcessNotifyList (Private);\r
 \r
-Returns:\r
-  None\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 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_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE\r
+              //\r
+              Private->Fv[FvCount].PeimState[PeimCount]++;\r
+\r
+              //\r
+              // Process the Notify list and dispatch any notifies for\r
+              // newly installed PPIs.\r
+              //\r
+              ProcessNotifyList (Private);\r
+            }\r
+          }\r
+        }\r
+      }\r
+\r
+      //\r
+      // We set to NULL here to optimize the 2nd entry to this routine after\r
+      //  memory is found. This reprevents rescanning of the FV. We set to\r
+      //  NULL here so we start at the begining of the next FV\r
+      //\r
+      Private->CurrentFileHandle = NULL;\r
+      Private->CurrentPeimCount = 0;\r
+      //\r
+      // Before walking through the next FV,Private->CurrentFvFileHandles[]should set to NULL\r
+      //\r
+      SetMem (Private->CurrentFvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv), 0);\r
+    }\r
+\r
+    //\r
+    // Before making another pass, we should set Private->CurrentPeimFvCount =0 to go\r
+    // through all the FV.\r
+    //\r
+    Private->CurrentPeimFvCount = 0;\r
+\r
+    //\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/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
 \r
---*/\r
-{\r
-  //\r
-  // Check if the total number of PEIMs exceed the bitmap.\r
-  // CurrentPeim is 0-based\r
-  //\r
-  ASSERT (CurrentPeim < (sizeof (*DispatchedPeimBitMap) * 8));\r
-  *DispatchedPeimBitMap |= (1 << CurrentPeim);\r
-  return;\r
 }\r
 \r
-BOOLEAN\r
-DepexSatisfied (\r
-  IN EFI_PEI_SERVICES  **PeiServices,\r
-  IN VOID              *CurrentPeimAddress\r
+/**\r
+  Initialize the Dispatcher's data members\r
+\r
+  @param PrivateData     PeiCore's private data structure\r
+  @param OldCoreData     Old data from SecCore\r
+                         NULL if being run in non-permament memory mode.\r
+  @param 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
+\r
+  @return None.\r
+\r
+**/\r
+VOID\r
+InitializeDispatcherData (\r
+  IN PEI_CORE_INSTANCE            *PrivateData,\r
+  IN PEI_CORE_INSTANCE            *OldCoreData,\r
+  IN CONST EFI_SEC_PEI_HAND_OFF   *SecCoreData\r
   )\r
-/*++\r
+{\r
+  if (OldCoreData == NULL) {\r
+    PrivateData->PeimDispatcherReenter = FALSE;\r
+    PeiInitializeFv (PrivateData, SecCoreData);\r
+  } else {\r
+    PeiReinitializeFv (PrivateData);\r
+  }\r
 \r
-Routine Description:\r
+  return;\r
+}\r
 \r
+/**\r
   This routine parses the Dependency Expression, if available, and\r
   decides if the module can be executed.\r
 \r
-Arguments:\r
-  PeiServices - The PEI Service Table\r
-  CurrentPeimAddress - Address of the PEIM Firmware File under investigation\r
 \r
-Returns:\r
-  TRUE  - Can be dispatched\r
-  FALSE - Cannot be dispatched\r
+  @param Private         PeiCore's private data structure\r
+  @param FileHandle      PEIM's file handle\r
+  @param PeimCount       Peim count in all dispatched PEIMs.\r
+\r
+  @retval TRUE   Can be dispatched\r
+  @retval FALSE  Cannot be dispatched\r
 \r
---*/\r
+**/\r
+BOOLEAN\r
+DepexSatisfied (\r
+  IN PEI_CORE_INSTANCE          *Private,\r
+  IN EFI_PEI_FILE_HANDLE        FileHandle,\r
+  IN UINTN                      PeimCount\r
+  )\r
 {\r
-  EFI_STATUS  Status;\r
-  INT8        *DepexData;\r
-  BOOLEAN     Runnable;\r
+  EFI_STATUS           Status;\r
+  VOID                 *DepexData;\r
+  EFI_FV_FILE_INFO     FileInfo;\r
 \r
-  Status = PeiServicesFfsFindSectionData (\r
-             EFI_SECTION_PEI_DEPEX,\r
-             CurrentPeimAddress,\r
-             (VOID **)&DepexData\r
-             );\r
-  //\r
-  // If there is no DEPEX, assume the module can be executed\r
-  //\r
+  Status = PeiServicesFfsGetFileInfo (FileHandle, &FileInfo);\r
   if (EFI_ERROR (Status)) {\r
+    DEBUG ((DEBUG_DISPATCH, "Evaluate PEI DEPEX for FFS(Unknown)\n"));\r
+  } else {\r
+    DEBUG ((DEBUG_DISPATCH, "Evaluate PEI DEPEX for FFS(%g)\n", &FileInfo.FileName));\r
+  }\r
+  \r
+  if (PeimCount < Private->AprioriCount) {\r
+    //\r
+    // If its in the A priori file then we set Depex to TRUE\r
+    //\r
+    DEBUG ((DEBUG_DISPATCH, "  RESULT = TRUE (Apriori)\n"));\r
     return TRUE;\r
   }\r
 \r
   //\r
-  // Evaluate a given DEPEX\r
+  // Depex section not in the encapsulated section.\r
   //\r
-  Status = PeimDispatchReadiness (\r
-            PeiServices,\r
-            DepexData,\r
-            &Runnable\r
-            );\r
-\r
-  return Runnable;\r
-}\r
-\r
-STATIC\r
-VOID *\r
-TransferOldDataToNewDataRange (\r
-  IN PEI_CORE_INSTANCE        *PrivateData\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  This routine transfers the contents of the pre-permanent memory\r
-  PEI Core private data to a post-permanent memory data location.\r
-\r
-Arguments:\r
-\r
-  PrivateData       - Pointer to the current PEI Core private data pre-permanent memory\r
-\r
-Returns:\r
+  Status = PeiServicesFfsFindSectionData (\r
+              EFI_SECTION_PEI_DEPEX,\r
+              FileHandle,\r
+              (VOID **)&DepexData\r
+              );\r
 \r
-  Pointer to the PrivateData once the private data has been transferred to permanent memory\r
+  if (EFI_ERROR (Status)) {\r
+    //\r
+    // If there is no DEPEX, assume the module can be executed\r
+    //\r
+    DEBUG ((DEBUG_DISPATCH, "  RESULT = TRUE (No DEPEX)\n"));\r
+    return TRUE;\r
+  }\r
 \r
---*/\r
-{\r
   //\r
-  //Build private HOB to PEI core to transfer old NEM-range data to new NEM-range\r
+  // Evaluate a given DEPEX\r
   //\r
-  return BuildGuidDataHob (&gEfiPeiCorePrivateGuid, PrivateData, sizeof (PEI_CORE_INSTANCE));\r
+  return PeimDispatchReadiness (&Private->Ps, DepexData);\r
 }\r
 \r
 /**\r
   This routine enable a PEIM to register itself to shadow when PEI Foundation\r
   discovery permanent memory.\r
 \r
-       @param FileHandle       File handle of a PEIM.\r
-  \r
-  @retval EFI_NOT_FOUND                                The file handle doesn't point to PEIM itself.\r
-  @retval EFI_ALREADY_STARTED          Indicate that the PEIM has been registered itself.\r
-  @retval EFI_SUCCESS                                          Successfully to register itself.\r
+  @param FileHandle             File handle of a PEIM.\r
 \r
-**/ \r
+  @retval EFI_NOT_FOUND         The file handle doesn't point to PEIM itself.\r
+  @retval EFI_ALREADY_STARTED   Indicate that the PEIM has been registered itself.\r
+  @retval EFI_SUCCESS           Successfully to register itself.\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 PeiRegisterForShadow (\r
@@ -577,57 +1356,17 @@ 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
 \r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  This routine invoke the PeiCore's entry in new stack environment.\r
+  Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = PEIM_STATE_REGISTER_FOR_SHADOW;\r
 \r
-       @param Context1         The first context parameter is entry of PeiCore\r
-  @param Context2      The second context parameter is parameter structure point for PeiCore\r
-\r
-**/ \r
-STATIC\r
-VOID\r
-InvokePeiCore (\r
-  VOID          *Context1,\r
-  VOID          *Context2\r
-  )\r
-{\r
-  PEI_CORE_ENTRY_POINT  PeiCoreEntryPoint;\r
-  PEI_CORE_PARAMETERS       *PeiCoreParameters;\r
-\r
-  //\r
-  // Running on new stack in SEC Core\r
-  //\r
-\r
-  PeiCoreEntryPoint = (PEI_CORE_ENTRY_POINT) (UINTN) Context1;\r
-  PeiCoreParameters = (PEI_CORE_PARAMETERS *)Context2;\r
-\r
-  //\r
-  // Call PEI Core using new stack\r
-  //\r
-  PeiCoreEntryPoint (\r
-    PeiCoreParameters->SecCoreData,\r
-    PeiCoreParameters->PpiList,\r
-    PeiCoreParameters->Data\r
-    );\r
-\r
-  //\r
-  // Never returns\r
-  //\r
-  ASSERT_EFI_ERROR (FALSE);\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 \r
 \r
-\r