]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
MdeModulePkg/IntelFrameworkModulePkg: Update PeiCore, SmbiosDxe and IsaSerialDxe...
[mirror_edk2.git] / MdeModulePkg / Core / Pei / Dispatcher / Dispatcher.c
index f4392b78ddf82466f9472866a8e881c7b63eab8b..4004a3ad6286d7224bb1045ba4f8ae62ea638b32 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PEI Core dispatch services\r
   \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<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
@@ -49,8 +49,8 @@ DiscoverPeimsAndOrderWithApriori (
   UINTN                               PeimIndex;\r
   UINTN                               PeimCount;\r
   EFI_GUID                            *Guid;\r
-  EFI_PEI_FILE_HANDLE                 TempFileHandles[FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)];\r
-  EFI_GUID                            FileGuid[FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)];\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
@@ -63,32 +63,35 @@ DiscoverPeimsAndOrderWithApriori (
   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 (Private->CurrentFvFileHandles));\r
+    CopyMem (Private->CurrentFvFileHandles, Private->Fv[Private->CurrentPeimFvCount].FvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
     return;\r
   }\r
 \r
   //\r
   // Go ahead to scan this Fv, and cache FileHandles within it.\r
   //\r
-  for (PeimCount = 0; PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {\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) {\r
+    if (Status != EFI_SUCCESS || PeimCount == PcdGet32 (PcdPeiCoreMaxPeimPerFv)) {\r
       break;\r
     }\r
 \r
     Private->CurrentFvFileHandles[PeimCount] = FileHandle;\r
   }\r
-  \r
+\r
   //\r
-  // Check whether the count of Peims exceeds the max support PEIMs in a FV image\r
-  // If more Peims are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.\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
-  ASSERT (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
+  ASSERT ((Status != EFI_SUCCESS) || (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)));\r
 \r
   //\r
   // Get Apriori File handle\r
@@ -114,7 +117,6 @@ DiscoverPeimsAndOrderWithApriori (
       }\r
       Private->AprioriCount /= sizeof (EFI_GUID);\r
 \r
-      ZeroMem (FileGuid, sizeof (FileGuid));\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
@@ -175,7 +177,7 @@ DiscoverPeimsAndOrderWithApriori (
       // 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 (Private->CurrentFvFileHandles));\r
+      CopyMem (Private->CurrentFvFileHandles, TempFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
     }\r
   }\r
   //\r
@@ -183,7 +185,7 @@ DiscoverPeimsAndOrderWithApriori (
   // 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 (Private->CurrentFvFileHandles));\r
+  CopyMem (Private->Fv[Private->CurrentPeimFvCount].FvFileHandles, Private->CurrentFvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
 \r
 }\r
 \r
@@ -606,6 +608,29 @@ PeiLoadFixAddressHook(
   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
   Conduct PEIM dispatch.\r
 \r
@@ -637,17 +662,29 @@ PeiDispatcher (
   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
-  EFI_PHYSICAL_ADDRESS                TemporaryStackSize;\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
-\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
   PeimFileHandle = NULL;\r
@@ -663,7 +700,7 @@ PeiDispatcher (
     SaveCurrentFileHandle =  Private->CurrentFileHandle;\r
 \r
     for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {\r
-      for (Index2 = 0; (Index2 < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {\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
           PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];\r
           Status = PeiLoadImage (\r
@@ -749,7 +786,7 @@ PeiDispatcher (
       // Start to dispatch all modules within the current Fv.\r
       //\r
       for (PeimCount = Private->CurrentPeimCount;\r
-           (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);\r
+           (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);\r
            PeimCount++) {\r
         Private->CurrentPeimCount  = PeimCount;\r
         PeimFileHandle = Private->CurrentFileHandle = Private->CurrentFvFileHandles[PeimCount];\r
@@ -881,13 +918,6 @@ PeiDispatcher (
               //\r
               TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r
               TopOfNewStack = Private->PhysicalMemoryBegin + NewStackSize;\r
-              if (TopOfNewStack >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
-                Private->HeapOffsetPositive = TRUE;\r
-                Private->HeapOffset = (UINTN)(TopOfNewStack - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
-              } else {\r
-                Private->HeapOffsetPositive = FALSE;\r
-                Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - TopOfNewStack);\r
-              }\r
               if (TopOfNewStack >= TopOfOldStack) {\r
                 StackOffsetPositive = TRUE;\r
                 StackOffset = (UINTN)(TopOfNewStack - TopOfOldStack);\r
@@ -898,8 +928,6 @@ PeiDispatcher (
               Private->StackOffsetPositive = StackOffsetPositive;\r
               Private->StackOffset = StackOffset;\r
 \r
-              DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64)Private->HeapOffset, (UINT64)(StackOffset)));\r
-\r
               //\r
               // Build Stack HOB that describes the permanent memory stack\r
               //\r
@@ -909,21 +937,13 @@ PeiDispatcher (
               //\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
-\r
-              //\r
-              // Caculate 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
+              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
@@ -934,6 +954,31 @@ PeiDispatcher (
                          (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
+                // Caculate 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
@@ -947,18 +992,110 @@ PeiDispatcher (
                                           TemporaryRamSize\r
                                           );\r
 \r
+                //\r
+                // Entry PEI Phase 2\r
+                //\r
+                PeiCore (SecCoreData, NULL, Private);\r
               } else {\r
                 //\r
-                // In IA32/x64/Itanium architecture, we need platform provide\r
-                // TEMPORARY_RAM_MIGRATION_PPI.\r
+                // Migrate the PEI Services Table pointer from temporary RAM to permanent RAM.\r
                 //\r
-                ASSERT (FALSE);\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
-              //\r
-              // Entry PEI Phase 2\r
-              //\r
-              PeiCore (SecCoreData, NULL, Private);\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
@@ -1008,7 +1145,7 @@ PeiDispatcher (
       //\r
       // Before walking through the next FV,Private->CurrentFvFileHandles[]should set to NULL\r
       //\r
-      SetMem (Private->CurrentFvFileHandles, sizeof (Private->CurrentFvFileHandles), 0);\r
+      SetMem (Private->CurrentFvFileHandles, sizeof (EFI_PEI_FILE_HANDLE) * PcdGet32 (PcdPeiCoreMaxPeimPerFv), 0);\r
     }\r
 \r
     //\r