/** @file\r
EFI PEI Core dispatch services\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\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
http://opensource.org/licenses/bsd-license.php\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_PEI_FV_HANDLE FileHandle;\r
+ EFI_PEI_FILE_HANDLE FileHandle;\r
EFI_PEI_FILE_HANDLE AprioriFileHandle;\r
EFI_GUID *Apriori;\r
UINTN Index;\r
UINTN PeimIndex;\r
UINTN PeimCount;\r
EFI_GUID *Guid;\r
- EFI_PEI_FV_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
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 < PcdGet32 (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 < PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
+ ASSERT ((Status != EFI_SUCCESS) || (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)));\r
\r
//\r
// Get Apriori File handle\r
//\r
Status = FvPpi->GetFileInfo (FvPpi, AprioriFileHandle, &FileInfo);\r
ASSERT_EFI_ERROR (Status);\r
- Private->AprioriCount = FileInfo.BufferSize & 0x00FFFFFF;\r
- Private->AprioriCount -= sizeof (EFI_COMMON_SECTION_HEADER);\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
- 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
\r
//\r
// Walk through FileGuid array to find out who is invalid PEIM guid in Apriori file.\r
- // Add avalible PEIMs in Apriori file into TempFileHandles array at first.\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
// 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
// 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
+//\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
- Shadow PeiCore module from flash to installed memory.\r
+ This function is to test if the memory range described in resource HOB is available or not. \r
\r
- @param PeiServices An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
- @param PrivateInMem PeiCore's private data structure\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
- @return PeiCore function address after shadowing.\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
-VOID*\r
-ShadowPeiCore(\r
- IN CONST EFI_PEI_SERVICES **PeiServices,\r
- IN PEI_CORE_INSTANCE *PrivateInMem\r
+BOOLEAN\r
+PeiLoadFixAddressIsMemoryRangeAvailable (\r
+ IN PEI_CORE_INSTANCE *PrivateData,\r
+ IN EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob\r
)\r
{\r
- EFI_PEI_FILE_HANDLE PeiCoreFileHandle;\r
- EFI_PHYSICAL_ADDRESS EntryPoint;\r
- EFI_STATUS Status;\r
- UINT32 AuthenticationState;\r
-\r
- PeiCoreFileHandle = NULL;\r
-\r
- //\r
- // Find the PEI Core in the BFV\r
- //\r
- Status = PrivateInMem->Fv[0].FvPpi->FindFileByType (\r
- PrivateInMem->Fv[0].FvPpi,\r
- EFI_FV_FILETYPE_PEI_CORE,\r
- PrivateInMem->Fv[0].FvHandle,\r
- &PeiCoreFileHandle\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- //\r
- // Shadow PEI Core into memory so it will run faster\r
- //\r
- Status = PeiLoadImage (\r
- PeiServices,\r
- *((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle),\r
- PEIM_STATE_REGISITER_FOR_SHADOW,\r
- &EntryPoint,\r
- &AuthenticationState\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- //\r
- // Compute the PeiCore's function address after shaowed PeiCore.\r
- // _ModuleEntryPoint is PeiCore main function entry\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
- return (VOID*) ((UINTN) EntryPoint + (UINTN) PeiCore - (UINTN) _ModuleEntryPoint);\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
-// 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
Hook function for Loading Module at Fixed Address feature\r
\r
EFI_PEI_HOB_POINTERS CurrentHob;\r
EFI_PEI_HOB_POINTERS Hob;\r
EFI_PEI_HOB_POINTERS NextHob;\r
- EFI_PHYSICAL_ADDRESS MaxMemoryBaseAddress;\r
- UINT64 MaxMemoryLength;\r
+ EFI_HOB_MEMORY_ALLOCATION *MemoryHob;\r
//\r
// Initialize Local Variables\r
//\r
CurrentResourceHob = NULL;\r
ResourceHob = NULL;\r
NextResourceHob = NULL;\r
- MaxMemoryBaseAddress = 0;\r
- MaxMemoryLength = 0;\r
HighAddress = 0;\r
TopLoadingAddress = 0;\r
MemoryRangeEnd = 0;\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 = EFI_PAGES_TO_SIZE(PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber)+ PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber))\r
- + MINIMUM_INITIAL_MEMORY_SIZE; \r
- \r
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressRuntimeCodePageNumber= %x.\n", PcdGet32(PcdLoadFixAddressRuntimeCodePageNumber)));\r
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressBootTimeCodePageNumber= %x.\n", PcdGet32(PcdLoadFixAddressBootTimeCodePageNumber)));\r
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PcdLoadFixAddressPeiCodePageNumber= %x.\n", PcdGet32(PcdLoadFixAddressPeiCodePageNumber))); \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
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Total Reserved Memory Size = %lx.\n", TotalReservedMemorySize));\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
//\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
+ if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||\r
ResourceHob->PhysicalStart + ResourceHob->ResourceLength > MAX_ADDRESS) {\r
continue;\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
+ // See if this is a resource descriptor HOB\r
+ //\r
+ if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
+ NextResourceHob = NextHob.ResourceDescriptor;\r
+ //\r
+ // If range described in this hob is not system memory or heigher than MAX_ADDRESS, ignored.\r
+ //\r
+ if (NextResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) {\r
+ continue;\r
+ }\r
+ //\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)FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) > 0 ) {\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)FixedPcdGet64(PcdLoadModuleAtFixAddressEnable);\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 %lx is invalid since top address should be page align. \n", TopLoadingAddress)); \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
// See if Top address specified by user is valid.\r
//\r
if (ResourceHob->PhysicalStart + TotalReservedMemorySize < TopLoadingAddress && \r
- (ResourceHob->PhysicalStart + ResourceHob->ResourceLength - MINIMUM_INITIAL_MEMORY_SIZE) >= 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
} \r
if (CurrentResourceHob != NULL) {\r
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO:Top Address %lx is valid \n", TopLoadingAddress));\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 %lx is invalid \n", TopLoadingAddress)); \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
// See if Top address specified by user is valid.\r
//\r
- if (ResourceHob->ResourceLength > TotalReservedMemorySize) {\r
- DEBUG ((EFI_D_INFO, "(%lx, %lx)\n", \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
// Assert here \r
//\r
- ASSERT (FALSE); \r
+ ASSERT (FALSE); \r
+ return; \r
} \r
} else {\r
//\r
//\r
if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY && \r
ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= MAX_ADDRESS &&\r
- ResourceHob->ResourceLength > TotalReservedMemorySize) {\r
+ ResourceHob->ResourceLength > TotalReservedMemorySize && PeiLoadFixAddressIsMemoryRangeAvailable(PrivateData, ResourceHob)) {\r
//\r
// See if this is the highest largest system memory region below MaxAddress\r
//\r
//\r
// Assert here \r
//\r
- ASSERT (FALSE); \r
+ ASSERT (FALSE);\r
+ return; \r
} else {\r
TopLoadingAddress = CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength ; \r
} \r
\r
if (CurrentResourceHob != NULL) {\r
//\r
- // rebuild hob for PEI memmory and reserved memory\r
+ // rebuild resource HOB for PEI memmory and reserved memory\r
//\r
BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY, // MemoryType,\r
+ EFI_RESOURCE_SYSTEM_MEMORY, \r
(\r
EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
),\r
- (TopLoadingAddress - TotalReservedMemorySize), // MemoryBegin\r
- TotalReservedMemorySize // MemoryLength\r
+ (TopLoadingAddress - TotalReservedMemorySize), \r
+ TotalReservedMemorySize \r
);\r
//\r
- // rebuild hob for the remain memory if necessary\r
+ // rebuild resource for the remain memory if necessary\r
//\r
if (CurrentResourceHob->PhysicalStart < TopLoadingAddress - TotalReservedMemorySize) {\r
BuildResourceDescriptorHob (\r
- EFI_RESOURCE_SYSTEM_MEMORY, // MemoryType,\r
+ EFI_RESOURCE_SYSTEM_MEMORY, \r
(\r
EFI_RESOURCE_ATTRIBUTE_PRESENT |\r
EFI_RESOURCE_ATTRIBUTE_INITIALIZED |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |\r
EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE\r
),\r
- CurrentResourceHob->PhysicalStart, // MemoryBegin\r
- (TopLoadingAddress - TotalReservedMemorySize - CurrentResourceHob->PhysicalStart) // MemoryLength\r
+ CurrentResourceHob->PhysicalStart, \r
+ (TopLoadingAddress - TotalReservedMemorySize - CurrentResourceHob->PhysicalStart) \r
);\r
}\r
if (CurrentResourceHob->PhysicalStart + CurrentResourceHob->ResourceLength > TopLoadingAddress ) {\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 = %lx\n", PrivateData->LoadModuleAtFixAddressTopAddress)); \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
Conduct PEIM dispatch.\r
\r
UINTN SaveCurrentFvCount;\r
EFI_PEI_FILE_HANDLE SaveCurrentFileHandle;\r
PEIM_FILE_HANDLE_EXTENDED_DATA ExtendedData;\r
- EFI_PHYSICAL_ADDRESS NewPermenentMemoryBase;\r
- TEMPORARY_RAM_SUPPORT_PPI *TemporaryRamSupportPpi;\r
- EFI_HOB_HANDOFF_INFO_TABLE *OldHandOffTable;\r
- EFI_HOB_HANDOFF_INFO_TABLE *NewHandOffTable;\r
- INTN StackOffset;\r
- INTN HeapOffset;\r
- PEI_CORE_INSTANCE *PrivateInMem;\r
- UINT64 NewPeiStackSize;\r
- UINT64 OldPeiStackSize;\r
- UINT64 StackGap;\r
+ EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI *TemporaryRamSupportPpi;\r
+ UINT64 NewStackSize;\r
+ UINTN HeapTemporaryRamSize;\r
+ EFI_PHYSICAL_ADDRESS BaseOfNewHeap;\r
+ EFI_PHYSICAL_ADDRESS TopOfNewStack;\r
+ EFI_PHYSICAL_ADDRESS TopOfOldStack;\r
+ EFI_PHYSICAL_ADDRESS TemporaryRamBase;\r
+ UINTN TemporaryRamSize;\r
+ UINTN TemporaryStackSize;\r
+ VOID *TemporaryStackBase;\r
+ UINTN PeiTemporaryRamSize;\r
+ VOID *PeiTemporaryRamBase;\r
+ UINTN StackOffset;\r
+ BOOLEAN StackOffsetPositive;\r
+ EFI_PHYSICAL_ADDRESS HoleMemBase;\r
+ UINTN HoleMemSize;\r
EFI_FV_FILE_INFO FvFileInfo;\r
- UINTN OldCheckingTop;\r
- UINTN OldCheckingBottom;\r
PEI_CORE_FV_HANDLE *CoreFvHandle;\r
VOID *LoadFixPeiCodeBegin;\r
-\r
- PeiServices = (CONST EFI_PEI_SERVICES **) &Private->PS;\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
EntryPoint = 0;\r
\r
- if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\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_REGISITER_FOR_SHADOW to PEIM_STATE_DONE.\r
if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {\r
PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];\r
Status = PeiLoadImage (\r
- (CONST EFI_PEI_SERVICES **) &Private->PS,\r
+ (CONST EFI_PEI_SERVICES **) &Private->Ps,\r
PeimFileHandle,\r
PEIM_STATE_REGISITER_FOR_SHADOW,\r
&EntryPoint,\r
PeimEntryPoint = (EFI_PEIM_ENTRY_POINT2)(UINTN)EntryPoint;\r
\r
PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
- PeimEntryPoint(PeimFileHandle, (const EFI_PEI_SERVICES **) &Private->PS);\r
+ PeimEntryPoint(PeimFileHandle, (const EFI_PEI_SERVICES **) &Private->Ps);\r
PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
}\r
\r
//\r
// For Fv type file, Produce new FV PPI and FV hob\r
//\r
- Status = ProcessFvFile (&Private->Fv[FvCount], PeimFileHandle);\r
- AuthenticationState = 0;\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
+ }\r
} else {\r
//\r
// For PEIM driver, Load its entry point\r
&EntryPoint,\r
&AuthenticationState\r
);\r
- }\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
- ExtendedData.Handle = (EFI_HANDLE)PeimFileHandle;\r
-\r
- REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
- EFI_PROGRESS_CODE,\r
- (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
- (VOID *)(&ExtendedData),\r
- sizeof (ExtendedData)\r
- );\r
-\r
- Status = VerifyPeim (Private, CoreFvHandle->FvHandle, PeimFileHandle);\r
- if (Status != EFI_SECURITY_VIOLATION && (AuthenticationState == 0)) {\r
+ if (Status == EFI_SUCCESS) {\r
//\r
- // PEIM_STATE_NOT_DISPATCHED move to PEIM_STATE_DISPATCHED\r
+ // The PEIM has its dependencies satisfied, and its entry point\r
+ // has been found, so invoke it.\r
//\r
- Private->Fv[FvCount].PeimState[PeimCount]++;\r
+ PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
+\r
+ ExtendedData.Handle = (EFI_HANDLE)PeimFileHandle;\r
+\r
+ REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
+ (VOID *)(&ExtendedData),\r
+ sizeof (ExtendedData)\r
+ );\r
\r
- if (FvFileInfo.FileType != EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) {\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
}\r
\r
- Private->PeimDispatchOnThisPass = TRUE;\r
- }\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
- PERF_END (PeimFileHandle, "PEIM", NULL, 0);\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
+ PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
\r
+ }\r
}\r
\r
if (Private->SwitchStackSignal) {\r
&& (*StackPointer == INIT_CAR_VALUE);\r
StackPointer ++);\r
\r
+ DEBUG ((EFI_D_INFO, "Temp Stack : BaseAddress=0x%p Length=0x%X\n", SecCoreData->StackBase, (UINT32)SecCoreData->StackSize));\r
+ DEBUG ((EFI_D_INFO, "Temp Heap : BaseAddress=0x%p Length=0x%X\n", Private->HobList.Raw, (UINT32)((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN) Private->HobList.Raw)));\r
DEBUG ((EFI_D_INFO, "Total temporary memory: %d bytes.\n", (UINT32)SecCoreData->TemporaryRamSize));\r
DEBUG ((EFI_D_INFO, " temporary memory stack ever used: %d bytes.\n",\r
- (SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
+ (UINT32)(SecCoreData->StackSize - ((UINTN) StackPointer - (UINTN)SecCoreData->StackBase))\r
));\r
DEBUG ((EFI_D_INFO, " temporary memory heap used: %d bytes.\n",\r
- ((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
- (UINTN) Private->HobList.Raw)\r
+ (UINT32)((UINTN)Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom - (UINTN)Private->HobList.Raw)\r
));\r
DEBUG_CODE_END ();\r
\r
- if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\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
+ PeiLoadFixAddressHook (Private);\r
+\r
+ //\r
+ // If Loading Module at Fixed Address is enabled, Allocating memory range for Pei code range.\r
+ //\r
+ LoadFixPeiCodeBegin = AllocatePages((UINTN)PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
+ DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PeiCodeBegin = 0x%lX, PeiCodeTop= 0x%lX\n", (UINT64)(UINTN)LoadFixPeiCodeBegin, (UINT64)((UINTN)LoadFixPeiCodeBegin + PcdGet32(PcdLoadFixAddressPeiCodePageNumber) * EFI_PAGE_SIZE)));\r
}\r
\r
//\r
// Reserve the size of new stack at bottom of physical memory\r
//\r
- OldPeiStackSize = (UINT64) SecCoreData->StackSize;\r
- NewPeiStackSize = (RShiftU64 (Private->PhysicalMemoryLength, 1) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\r
- if (PcdGet32(PcdPeiCoreMaxPeiStackSize) > (UINT32) NewPeiStackSize) {\r
- Private->StackSize = NewPeiStackSize;\r
- } else {\r
- Private->StackSize = PcdGet32(PcdPeiCoreMaxPeiStackSize);\r
- }\r
-\r
- //\r
- // In theory, the size of new stack in permenent memory should large than\r
- // size of old stack in temporary memory.\r
+ // The size of new stack in permenent memory must be the same size \r
+ // or larger than the size of old stack in temporary memory.\r
// But if new stack is smaller than the size of old stack, we also reserve\r
// the size of old stack at bottom of permenent memory.\r
//\r
- DEBUG ((EFI_D_INFO, "Old Stack size %d, New stack size %d\n", (INT32) OldPeiStackSize, (INT32) Private->StackSize));\r
- ASSERT (Private->StackSize >= OldPeiStackSize);\r
- StackGap = Private->StackSize - OldPeiStackSize;\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
- // Update HandOffHob for new installed permenent memory\r
+ // Caculate stack offset and heap offset between temporary memory and new permement \r
+ // memory seperately.\r
//\r
- OldHandOffTable = Private->HobList.HandoffInformationTable;\r
- OldCheckingBottom = (UINTN)(SecCoreData->TemporaryRamBase);\r
- OldCheckingTop = (UINTN)(OldCheckingBottom + SecCoreData->TemporaryRamSize);\r
+ TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;\r
+ TopOfNewStack = Private->PhysicalMemoryBegin + NewStackSize;\r
+ if (TopOfNewStack >= TopOfOldStack) {\r
+ StackOffsetPositive = TRUE;\r
+ StackOffset = (UINTN)(TopOfNewStack - TopOfOldStack);\r
+ } else {\r
+ StackOffsetPositive = FALSE;\r
+ StackOffset = (UINTN)(TopOfOldStack - TopOfNewStack);\r
+ }\r
+ Private->StackOffsetPositive = StackOffsetPositive;\r
+ Private->StackOffset = StackOffset;\r
\r
//\r
- // The whole temporary memory will be migrated to physical memory.\r
- // CAUTION: The new base is computed accounding to gap of new stack.\r
+ // Build Stack HOB that describes the permanent memory stack\r
//\r
- NewPermenentMemoryBase = Private->PhysicalMemoryBegin + StackGap;\r
- \r
+ DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n", TopOfNewStack - NewStackSize, NewStackSize));\r
+ BuildStackHob (TopOfNewStack - NewStackSize, NewStackSize);\r
+\r
//\r
- // Caculate stack offset and heap offset between temporary memory and new permement \r
- // memory seperately.\r
+ // Cache information from SecCoreData into locals before SecCoreData is converted to a permanent memory address\r
//\r
- StackOffset = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->StackBase;\r
- HeapOffset = (INTN) ((UINTN) Private->PhysicalMemoryBegin + Private->StackSize - \\r
- (UINTN) SecCoreData->PeiTemporaryRamBase);\r
- DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (INT64)HeapOffset, (INT64)StackOffset));\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
- // Caculate new HandOffTable and PrivateData address in permenet memory's stack\r
- //\r
- NewHandOffTable = (EFI_HOB_HANDOFF_INFO_TABLE *)((UINTN)OldHandOffTable + HeapOffset);\r
- PrivateInMem = (PEI_CORE_INSTANCE *)((UINTN) (VOID*) Private + StackOffset);\r
-\r
//\r
// TemporaryRamSupportPpi is produced by platform's SEC\r
//\r
- Status = PeiLocatePpi (\r
- (CONST EFI_PEI_SERVICES **) PeiServices,\r
+ Status = PeiServicesLocatePpi (\r
&gEfiTemporaryRamSupportPpiGuid,\r
0,\r
NULL,\r
(VOID**)&TemporaryRamSupportPpi\r
);\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Heap Offset\r
+ //\r
+ BaseOfNewHeap = TopOfNewStack;\r
+ if (BaseOfNewHeap >= (UINTN)SecCoreData->PeiTemporaryRamBase) {\r
+ Private->HeapOffsetPositive = TRUE;\r
+ Private->HeapOffset = (UINTN)(BaseOfNewHeap - (UINTN)SecCoreData->PeiTemporaryRamBase);\r
+ } else {\r
+ Private->HeapOffsetPositive = FALSE;\r
+ Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);\r
+ }\r
\r
+ DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
+\r
+ //\r
+ // 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
- if (!EFI_ERROR (Status)) {\r
//\r
- // Temporary Ram support Ppi is provided by platform, it will copy \r
+ // Temporary Ram Support PPI is provided by platform, it will copy \r
// temporary memory to permenent memory and do stack switching.\r
- // After invoken temporary Ram support, following code's stack is in \r
- // memory but not in temporary memory.\r
+ // After invoking Temporary Ram Support PPI, the following code's \r
+ // stack is in permanent memory.\r
//\r
TemporaryRamSupportPpi->TemporaryRamMigration (\r
- (CONST EFI_PEI_SERVICES **) PeiServices,\r
- (EFI_PHYSICAL_ADDRESS)(UINTN) SecCoreData->TemporaryRamBase,\r
- (EFI_PHYSICAL_ADDRESS)(UINTN) NewPermenentMemoryBase,\r
- SecCoreData->TemporaryRamSize\r
+ PeiServices,\r
+ TemporaryRamBase,\r
+ (EFI_PHYSICAL_ADDRESS)(UINTN)(TopOfNewStack - TemporaryStackSize),\r
+ TemporaryRamSize\r
);\r
\r
+ //\r
+ // Entry PEI Phase 2\r
+ //\r
+ PeiCore (SecCoreData, NULL, Private);\r
} else {\r
//\r
- // In IA32/x64/Itanium architecture, we need platform provide\r
- // TEMPORAY_RAM_MIGRATION_PPI.\r
+ // Migrate the PEI Services Table pointer from temporary RAM to permanent RAM.\r
//\r
- ASSERT (FALSE);\r
- }\r
-\r
-\r
- //\r
- //\r
- // Fixup the PeiCore's private data\r
- //\r
- PrivateInMem->PS = &PrivateInMem->ServiceTableShadow;\r
- PrivateInMem->CpuIo = &PrivateInMem->ServiceTableShadow.CpuIo;\r
- PrivateInMem->HobList.Raw = (VOID*) ((UINTN) PrivateInMem->HobList.Raw + HeapOffset);\r
- PrivateInMem->StackBase = (EFI_PHYSICAL_ADDRESS)(((UINTN)PrivateInMem->PhysicalMemoryBegin + EFI_PAGE_MASK) & ~EFI_PAGE_MASK);\r
-\r
- PeiServices = (CONST EFI_PEI_SERVICES **) &PrivateInMem->PS;\r
-\r
- //\r
- // Fixup for PeiService's address\r
- //\r
- SetPeiServicesTablePointer(PeiServices);\r
-\r
- //\r
- // Update HandOffHob for new installed permenent memory\r
- //\r
- NewHandOffTable->EfiEndOfHobList =\r
- (EFI_PHYSICAL_ADDRESS)((UINTN) NewHandOffTable->EfiEndOfHobList + HeapOffset);\r
- NewHandOffTable->EfiMemoryTop = PrivateInMem->PhysicalMemoryBegin +\r
- PrivateInMem->PhysicalMemoryLength;\r
- NewHandOffTable->EfiMemoryBottom = PrivateInMem->PhysicalMemoryBegin;\r
- NewHandOffTable->EfiFreeMemoryTop = PrivateInMem->FreePhysicalMemoryTop;\r
- NewHandOffTable->EfiFreeMemoryBottom = NewHandOffTable->EfiEndOfHobList +\r
- sizeof (EFI_HOB_GENERIC_HEADER);\r
-\r
- //\r
- // We need convert the PPI desciptor's pointer\r
- //\r
- ConvertPpiPointers (PrivateInMem, \r
- OldCheckingBottom, \r
- OldCheckingTop, \r
- HeapOffset\r
- );\r
-\r
- DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%lX Length=0x%lX\n",\r
- PrivateInMem->StackBase,\r
- PrivateInMem->StackSize));\r
- BuildStackHob (PrivateInMem->StackBase, PrivateInMem->StackSize);\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
- // After the whole temporary memory is migrated, then we can allocate page in\r
- // permenent memory.\r
- //\r
- PrivateInMem->PeiMemoryInstalled = TRUE;\r
+ DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));\r
\r
- //\r
- // Indicate that PeiCore reenter\r
- //\r
- PrivateInMem->PeimDispatcherReenter = TRUE;\r
- \r
- if (FixedPcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
//\r
- // if Loading Module at Fixed Address is enabled, This is the first invoke to page \r
- // allocation for Pei Core segment. This memory segment should be reserved for loading PEIM\r
+ // Migrate Heap\r
//\r
- LoadFixPeiCodeBegin = AllocatePages((UINTN)PcdGet32(PcdLoadFixAddressPeiCodePageNumber));\r
- DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: PeiCodeBegin = %x, PeiCodeTop= %x\n", (UINTN)LoadFixPeiCodeBegin, ((UINTN)LoadFixPeiCodeBegin) + PcdGet32(PcdLoadFixAddressPeiCodePageNumber) * EFI_PAGE_SIZE)); \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
- // if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.\r
- // Every bit in the array indicate the status of the corresponding memory page, available or not\r
+ // Migrate Stack\r
//\r
- PrivateInMem->PeiCodeMemoryRangeUsageBitMap = AllocateZeroPool (((PcdGet32(PcdLoadFixAddressPeiCodePageNumber)>>6) + 1)*sizeof(UINT64));\r
- }\r
- //\r
- // Shadow PEI Core. When permanent memory is avaiable, shadow\r
- // PEI Core and PEIMs to get high performance.\r
- //\r
- PrivateInMem->ShadowedPeiCore = ShadowPeiCore (\r
- PeiServices,\r
- PrivateInMem\r
- );\r
- //\r
- // Process the Notify list and dispatch any notifies for\r
- // newly installed PPIs.\r
- //\r
- ProcessNotifyList (PrivateInMem);\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
- // Entry PEI Phase 2\r
- //\r
- PeiCore (SecCoreData, NULL, PrivateInMem);\r
+ //\r
+ // Switch new stack\r
+ //\r
+ SwitchStack (\r
+ (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntry,\r
+ (VOID *) SecCoreData,\r
+ (VOID *) Private,\r
+ (VOID *) (UINTN) TopOfNewStack\r
+ );\r
+ }\r
\r
//\r
// Code should not come here\r
//\r
- ASSERT_EFI_ERROR(FALSE);\r
+ ASSERT (FALSE);\r
}\r
\r
//\r
ProcessNotifyList (Private);\r
\r
if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW) && \\r
- (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
+ (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {\r
//\r
// If memory is availble we shadow images by default for performance reasons.\r
// We call the entry point a 2nd time so the module knows it's shadowed.\r
//\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
{\r
EFI_STATUS Status;\r
VOID *DepexData;\r
+ EFI_FV_FILE_INFO FileInfo;\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
// 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
// Evaluate a given DEPEX\r
//\r
- return PeimDispatchReadiness (&Private->PS, DepexData);\r
+ return PeimDispatchReadiness (&Private->Ps, DepexData);\r
}\r
\r
/**\r
projects / mirror_edk2.git / blobdiff