/** @file\r
-\r
-Copyright (c) 2006, Intel Corporation\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
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
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
-Abstract:\r
-\r
- EFI PEI Core dispatch services\r
-\r
-Revision History\r
-\r
**/\r
\r
-#include <PeiMain.h>\r
+#include "PeiMain.h"\r
\r
-//\r
-//CAR is filled with this initial value during SEC phase\r
-//\r
+///\r
+/// temporary memory is filled with this initial value during SEC phase\r
+///\r
#define INIT_CAR_VALUE 0x5AA55AA5\r
\r
typedef struct {\r
EFI_HANDLE Handle;\r
} PEIM_FILE_HANDLE_EXTENDED_DATA;\r
\r
-VOID\r
-DiscoverPeimsAndOrderWithApriori (\r
- IN PEI_CORE_INSTANCE *Private,\r
- IN EFI_PEI_FV_HANDLE VolumeHandle\r
- )\r
-/*++\r
-\r
-Routine Description:\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
-Arguments:\r
-\r
- Private - Pointer to the private data passed in from caller\r
- VolumeHandle - Fv handle.\r
-Returns:\r
\r
- NONE\r
+ @param Private Pointer to the private data passed in from caller\r
+ @param CoreFileHandle The instance of PEI_CORE_FV_HANDLE.\r
\r
---*/\r
+**/\r
+VOID\r
+DiscoverPeimsAndOrderWithApriori (\r
+ IN PEI_CORE_INSTANCE *Private,\r
+ IN PEI_CORE_FV_HANDLE *CoreFileHandle\r
+ )\r
{\r
EFI_STATUS Status;\r
EFI_PEI_FV_HANDLE FileHandle;\r
EFI_GUID *Guid;\r
EFI_PEI_FV_HANDLE TempFileHandles[FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)];\r
EFI_GUID FileGuid[FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)];\r
-\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
//\r
// Go ahead to scan this Fv, and cache FileHandles within it.\r
//\r
- for (PeimCount = 0; PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {\r
- Status = PeiFindFileEx (\r
- VolumeHandle,\r
- NULL,\r
- PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE,\r
- &FileHandle,\r
- &AprioriFileHandle\r
- );\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
break;\r
}\r
\r
Private->CurrentFvFileHandles[PeimCount] = FileHandle;\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
+ //\r
+ ASSERT (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
\r
+ //\r
+ // Get Apriori File handle\r
+ //\r
Private->AprioriCount = 0;\r
- if (AprioriFileHandle != NULL) {\r
+ Status = FvPpi->FindFileByName (FvPpi, &gPeiAprioriFileNameGuid, &CoreFileHandle->FvHandle, &AprioriFileHandle);\r
+ if (!EFI_ERROR(Status) && AprioriFileHandle != NULL) {\r
//\r
// Read the Apriori file\r
//\r
- Status = PeiServicesFfsFindSectionData (EFI_SECTION_RAW, AprioriFileHandle, (VOID **) &Apriori);\r
+ Status = FvPpi->FindSectionByType (FvPpi, EFI_SECTION_RAW, AprioriFileHandle, (VOID **) &Apriori);\r
if (!EFI_ERROR (Status)) {\r
//\r
// Calculate the number of PEIMs in the A Priori list\r
//\r
- Private->AprioriCount = *(UINT32 *)(((EFI_FFS_FILE_HEADER *)AprioriFileHandle)->Size) & 0x00FFFFFF;\r
- Private->AprioriCount -= sizeof (EFI_FFS_FILE_HEADER) - sizeof (EFI_COMMON_SECTION_HEADER);\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 /= sizeof (EFI_GUID);\r
\r
- SetMem (FileGuid, sizeof (FileGuid), 0);\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
// quickly from file name to file handle\r
//\r
- CopyMem (&FileGuid[Index], &((EFI_FFS_FILE_HEADER *)Private->CurrentFvFileHandles[Index])->Name,sizeof(EFI_GUID));\r
+ Status = FvPpi->GetFileInfo (FvPpi, Private->CurrentFvFileHandles[Index], &FileInfo);\r
+ CopyMem (&FileGuid[Index], &FileInfo.FileName, sizeof(EFI_GUID));\r
}\r
\r
//\r
\r
}\r
\r
+/**\r
+ Shadow PeiCore module from flash to installed memory.\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
+\r
+ @return PeiCore function address after shadowing.\r
+**/\r
VOID*\r
ShadowPeiCore(\r
- EFI_PEI_SERVICES **PeiServices,\r
- PEI_CORE_INSTANCE *PrivateInMem\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN PEI_CORE_INSTANCE *PrivateInMem\r
)\r
{\r
EFI_PEI_FILE_HANDLE PeiCoreFileHandle;\r
//\r
// Find the PEI Core in the BFV\r
//\r
- Status = PeiFindFileEx (\r
- (EFI_PEI_FV_HANDLE)PrivateInMem->Fv[0].FvHeader,\r
- NULL,\r
- EFI_FV_FILETYPE_PEI_CORE,\r
- &PeiCoreFileHandle,\r
- NULL\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
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
+ //\r
return (VOID*) ((UINTN) EntryPoint + (UINTN) PeiCore - (UINTN) _ModuleEntryPoint);\r
}\r
\r
-VOID\r
-PeiDispatcher (\r
- IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData,\r
- IN PEI_CORE_INSTANCE *Private\r
- )\r
-\r
-/*++\r
-\r
-Routine Description:\r
-\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
+ @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
- PrivateData - Pointer to the private data passed in from caller\r
- DispatchData - Pointer to PEI_CORE_DISPATCH_DATA data.\r
-\r
-Returns:\r
+ @param Private Pointer to the private data passed in from caller\r
\r
- EFI_SUCCESS - Successfully dispatched PEIM.\r
- EFI_NOT_FOUND - The dispatch failed.\r
-\r
---*/\r
+**/\r
+VOID\r
+PeiDispatcher (\r
+ IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData,\r
+ IN PEI_CORE_INSTANCE *Private\r
+ )\r
{\r
EFI_STATUS Status;\r
UINT32 Index1;\r
UINT32 Index2;\r
- EFI_PEI_SERVICES **PeiServices;\r
- EFI_PEI_FV_HANDLE VolumeHandle;\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
- BOOLEAN PeimNeedingDispatch;\r
- BOOLEAN PeimDispatchOnThisPass;\r
UINTN SaveCurrentPeimCount;\r
UINTN SaveCurrentFvCount;\r
EFI_PEI_FILE_HANDLE SaveCurrentFileHandle;\r
TEMPORARY_RAM_SUPPORT_PPI *TemporaryRamSupportPpi;\r
EFI_HOB_HANDOFF_INFO_TABLE *OldHandOffTable;\r
EFI_HOB_HANDOFF_INFO_TABLE *NewHandOffTable;\r
- INTN Offset;\r
+ INTN StackOffset;\r
+ INTN HeapOffset;\r
PEI_CORE_INSTANCE *PrivateInMem;\r
UINT64 NewPeiStackSize;\r
UINT64 OldPeiStackSize;\r
EFI_FV_FILE_INFO FvFileInfo;\r
UINTN OldCheckingTop;\r
UINTN OldCheckingBottom;\r
+ PEI_CORE_FV_HANDLE *CoreFvHandle;\r
\r
-\r
- PeiServices = &Private->PS;\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) &Private->PS;\r
PeimEntryPoint = NULL;\r
PeimFileHandle = NULL;\r
EntryPoint = 0;\r
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
- &Private->PS,\r
+ (CONST EFI_PEI_SERVICES **) &Private->PS,\r
PeimFileHandle,\r
+ PEIM_STATE_REGISITER_FOR_SHADOW,\r
&EntryPoint,\r
&AuthenticationState\r
);\r
//\r
PeimEntryPoint = (EFI_PEIM_ENTRY_POINT2)(UINTN)EntryPoint;\r
\r
- PERF_START (0, "PEIM", NULL, 0);\r
+ PERF_START (PeimFileHandle, "PEIM", NULL, 0);\r
PeimEntryPoint(PeimFileHandle, (const EFI_PEI_SERVICES **) &Private->PS);\r
- PERF_END (0, "PEIM", NULL, 0);\r
+ PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
}\r
\r
//\r
// satisfied, this dipatcher should run only once.\r
//\r
do {\r
- PeimNeedingDispatch = FALSE;\r
- PeimDispatchOnThisPass = FALSE;\r
-\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
- VolumeHandle = Private->Fv[FvCount].FvHeader;\r
\r
if (Private->CurrentPeimCount == 0) {\r
//\r
// reorder all PEIMs to ensure the PEIMs in Apriori file to get\r
// dispatch at first.\r
//\r
- DiscoverPeimsAndOrderWithApriori (Private, VolumeHandle);\r
+ DiscoverPeimsAndOrderWithApriori (Private, CoreFvHandle);\r
}\r
\r
//\r
// 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
\r
if (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_NOT_DISPATCHED) {\r
if (!DepexSatisfied (Private, PeimFileHandle, PeimCount)) {\r
- PeimNeedingDispatch = TRUE;\r
+ Private->PeimNeedingDispatch = TRUE;\r
} else {\r
- Status = PeiFfsGetFileInfo (PeimFileHandle, &FvFileInfo);\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 FV PPI and FV hob\r
//\r
- Status = ProcessFvFile (PeiServices, PeimFileHandle, &AuthenticationState);\r
+ Status = ProcessFvFile (&Private->Fv[FvCount], PeimFileHandle);\r
+ AuthenticationState = 0;\r
} else {\r
//\r
// For PEIM driver, Load its entry point\r
Status = PeiLoadImage (\r
PeiServices,\r
PeimFileHandle,\r
+ PEIM_STATE_NOT_DISPATCHED,\r
&EntryPoint,\r
&AuthenticationState\r
);\r
// The PEIM has its dependencies satisfied, and its entry point\r
// has been found, so invoke it.\r
//\r
- PERF_START (0, "PEIM", NULL, 0);\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
- FixedPcdGet32(PcdStatusCodeValuePeimDispatch),\r
+ (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
(VOID *)(&ExtendedData),\r
sizeof (ExtendedData)\r
);\r
\r
- Status = VerifyPeim (Private, VolumeHandle, PeimFileHandle);\r
+ Status = VerifyPeim (Private, CoreFvHandle->FvHandle, PeimFileHandle);\r
if (Status != EFI_SECURITY_VIOLATION && (AuthenticationState == 0)) {\r
//\r
// PEIM_STATE_NOT_DISPATCHED move to PEIM_STATE_DISPATCHED\r
PeimEntryPoint (PeimFileHandle, (const EFI_PEI_SERVICES **) PeiServices);\r
}\r
\r
- PeimDispatchOnThisPass = TRUE;\r
+ Private->PeimDispatchOnThisPass = TRUE;\r
}\r
\r
REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
EFI_PROGRESS_CODE,\r
- FixedPcdGet32(PcdStatusCodeValuePeimDispatch),\r
+ (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
(VOID *)(&ExtendedData),\r
sizeof (ExtendedData)\r
);\r
- PERF_END (0, "PEIM", NULL, 0);\r
+ PERF_END (PeimFileHandle, "PEIM", NULL, 0);\r
\r
}\r
\r
if (Private->SwitchStackSignal) {\r
//\r
- // Before switch stack from CAR to permenent memory, caculate the heap and stack\r
+ // Before switch stack from temporary memory to permenent memory, caculate the heap and stack\r
// usage in temporary memory for debuging.\r
//\r
DEBUG_CODE_BEGIN ();\r
&& (*StackPointer == INIT_CAR_VALUE);\r
StackPointer ++);\r
\r
- DEBUG ((EFI_D_INFO, "Total Cache as RAM: %d bytes.\n", SecCoreData->TemporaryRamSize));\r
- DEBUG ((EFI_D_INFO, " CAR stack ever used: %d bytes.\n",\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
));\r
- DEBUG ((EFI_D_INFO, " CAR heap used: %d bytes.\n",\r
+ DEBUG ((EFI_D_INFO, " temporary memory heap used: %d bytes.\n",\r
((UINTN) Private->HobList.HandoffInformationTable->EfiFreeMemoryBottom -\r
(UINTN) Private->HobList.Raw)\r
));\r
//\r
// Reserve the size of new stack at bottom of physical memory\r
//\r
- OldPeiStackSize = Private->StackSize;\r
+ OldPeiStackSize = (UINT64) SecCoreData->StackSize;\r
NewPeiStackSize = (RShiftU64 (Private->PhysicalMemoryLength, 1) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;\r
- if (FixedPcdGet32(PcdPeiCoreMaxPeiStackSize) > (UINT32) NewPeiStackSize) {\r
+ if (PcdGet32(PcdPeiCoreMaxPeiStackSize) > (UINT32) NewPeiStackSize) {\r
Private->StackSize = NewPeiStackSize;\r
} else {\r
- Private->StackSize = FixedPcdGet32(PcdPeiCoreMaxPeiStackSize);\r
+ Private->StackSize = PcdGet32(PcdPeiCoreMaxPeiStackSize);\r
}\r
\r
//\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
- StackGap = 0;\r
- if (Private->StackSize > OldPeiStackSize) {\r
- StackGap = Private->StackSize - OldPeiStackSize;\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
\r
//\r
// Update HandOffHob for new installed permenent memory\r
//\r
OldHandOffTable = Private->HobList.HandoffInformationTable;\r
- OldCheckingBottom = (UINTN)OldHandOffTable;\r
+ OldCheckingBottom = (UINTN)(SecCoreData->TemporaryRamBase);\r
OldCheckingTop = (UINTN)(OldCheckingBottom + SecCoreData->TemporaryRamSize);\r
\r
//\r
// CAUTION: The new base is computed accounding to gap of new stack.\r
//\r
NewPermenentMemoryBase = Private->PhysicalMemoryBegin + StackGap;\r
- Offset = (UINTN) NewPermenentMemoryBase - (UINTN) SecCoreData->TemporaryRamBase;\r
- NewHandOffTable = (EFI_HOB_HANDOFF_INFO_TABLE *)((UINTN)OldHandOffTable + Offset);\r
- PrivateInMem = (PEI_CORE_INSTANCE *)((UINTN) (VOID*) Private + Offset);\r
+ \r
+ //\r
+ // Caculate stack offset and heap offset between temporary memory and new permement \r
+ // memory seperately.\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
+ \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
\r
if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Temporary Ram support Ppi is provided by platform, it will copy \r
+ // temporary memory to permenent memory and do stack switching.\r
+ // After invoken temporary Ram support, following code's stack is in \r
+ // memory but not in temporary memory.\r
+ //\r
TemporaryRamSupportPpi->TemporaryRamMigration (\r
(CONST EFI_PEI_SERVICES **) PeiServices,\r
(EFI_PHYSICAL_ADDRESS)(UINTN) SecCoreData->TemporaryRamBase,\r
);\r
\r
} else {\r
- CopyMem (\r
- (VOID*)(UINTN) NewPermenentMemoryBase,\r
- SecCoreData->TemporaryRamBase,\r
- SecCoreData->TemporaryRamSize\r
- );\r
+ //\r
+ // In IA32/x64/Itanium architecture, we need platform provide\r
+ // TEMPORAY_RAM_MIGRATION_PPI.\r
+ //\r
+ ASSERT (FALSE);\r
}\r
\r
\r
//\r
PrivateInMem->PS = &PrivateInMem->ServiceTableShadow;\r
PrivateInMem->CpuIo = &PrivateInMem->ServiceTableShadow.CpuIo;\r
- PrivateInMem->HobList.Raw = (VOID*) ((UINTN) PrivateInMem->HobList.Raw + Offset);\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 = &PrivateInMem->PS;\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) &PrivateInMem->PS;\r
\r
//\r
// Fixup for PeiService's address\r
// Update HandOffHob for new installed permenent memory\r
//\r
NewHandOffTable->EfiEndOfHobList =\r
- (EFI_PHYSICAL_ADDRESS)((UINTN) NewHandOffTable->EfiEndOfHobList + Offset);\r
+ (EFI_PHYSICAL_ADDRESS)((UINTN) NewHandOffTable->EfiEndOfHobList + HeapOffset);\r
NewHandOffTable->EfiMemoryTop = PrivateInMem->PhysicalMemoryBegin +\r
PrivateInMem->PhysicalMemoryLength;\r
NewHandOffTable->EfiMemoryBottom = PrivateInMem->PhysicalMemoryBegin;\r
//\r
// We need convert the PPI desciptor's pointer\r
//\r
- ConvertPpiPointers ((CONST EFI_PEI_SERVICES **)PeiServices, \r
+ ConvertPpiPointers (PrivateInMem, \r
OldCheckingBottom, \r
OldCheckingTop, \r
- NewHandOffTable);\r
+ HeapOffset\r
+ );\r
\r
- DEBUG ((EFI_D_INFO, "Stack Hob: BaseAddress=0x%X Length=0x%X\n",\r
- (UINTN)PrivateInMem->StackBase,\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
\r
PrivateInMem->PeiMemoryInstalled = TRUE;\r
\r
//\r
- // Make sure we don't retry the same PEIM that added memory\r
+ // Indicate that PeiCore reenter\r
//\r
- PrivateInMem->CurrentPeimCount++;\r
-\r
+ PrivateInMem->PeimDispatcherReenter = TRUE;\r
+ \r
//\r
// Shadow PEI Core. When permanent memory is avaiable, shadow\r
// PEI Core and PEIMs to get high performance.\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
+ ASSERT (PeimEntryPoint != NULL);\r
PeimEntryPoint (PeimFileHandle, (const EFI_PEI_SERVICES **) PeiServices);\r
//PERF_END (PeiServices, L"PEIM", PeimFileHandle, 0);\r
\r
// pass. If we did not dispatch a PEIM there is no point in trying again\r
// as it will fail the next time too (nothing has changed).\r
//\r
- } while (PeimNeedingDispatch && PeimDispatchOnThisPass);\r
+ } while (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass);\r
\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
-Routine Description:\r
-\r
+/**\r
Initialize the Dispatcher's data members\r
\r
-Arguments:\r
-\r
- PeiServices - The PEI core services table.\r
- OldCoreData - Pointer to old core data (before switching stack).\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
- SecCoreData - Points to a data structure containing information about the PEI core's operating\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
-Returns:\r
-\r
- None.\r
+ @return None.\r
\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
if (OldCoreData == NULL) {\r
+ PrivateData->PeimDispatcherReenter = FALSE;\r
PeiInitializeFv (PrivateData, SecCoreData);\r
+ } else {\r
+ PeiReinitializeFv (PrivateData);\r
}\r
\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
+\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
BOOLEAN\r
DepexSatisfied (\r
IN PEI_CORE_INSTANCE *Private,\r
IN EFI_PEI_FILE_HANDLE FileHandle,\r
IN UINTN PeimCount\r
)\r
-/*++\r
-\r
-Routine Description:\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
-\r
---*/\r
{\r
EFI_STATUS Status;\r
VOID *DepexData;\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
+ @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
+ @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
\r
\r
\r
-/**\r
- Get Fv image from the FV type file, then install FV INFO ppi, Build FV hob.\r
-\r
- @param PeiServices Pointer to the PEI Core Services Table.\r
- @param FileHandle File handle of a Fv type file.\r
- @param AuthenticationState Pointer to attestation authentication state of image.\r
-\r
-\r
- @retval EFI_NOT_FOUND FV image can't be found.\r
- @retval EFI_SUCCESS Successfully to process it.\r
-\r
-**/\r
-EFI_STATUS\r
-ProcessFvFile (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_FILE_HANDLE FvFileHandle,\r
- OUT UINT32 *AuthenticationState\r
- )\r
-{\r
- EFI_STATUS Status;\r
- EFI_PEI_FV_HANDLE FvImageHandle;\r
- EFI_FV_INFO FvImageInfo;\r
- UINT32 FvAlignment;\r
- VOID *FvBuffer;\r
- EFI_PEI_HOB_POINTERS HobFv2;\r
-\r
- FvBuffer = NULL;\r
- *AuthenticationState = 0;\r
-\r
- //\r
- // Check if this EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE file has already\r
- // been extracted.\r
- //\r
- HobFv2.Raw = GetHobList ();\r
- while ((HobFv2.Raw = GetNextHob (EFI_HOB_TYPE_FV2, HobFv2.Raw)) != NULL) {\r
- if (CompareGuid (&(((EFI_FFS_FILE_HEADER *)FvFileHandle)->Name), &HobFv2.FirmwareVolume2->FileName)) {\r
- //\r
- // this FILE has been dispatched, it will not be dispatched again.\r
- //\r
- return EFI_SUCCESS;\r
- }\r
- HobFv2.Raw = GET_NEXT_HOB (HobFv2);\r
- }\r
-\r
- //\r
- // Find FvImage in FvFile\r
- //\r
- Status = PeiFfsFindSectionData (\r
- (CONST EFI_PEI_SERVICES **) PeiServices,\r
- EFI_SECTION_FIRMWARE_VOLUME_IMAGE,\r
- FvFileHandle,\r
- (VOID **)&FvImageHandle\r
- );\r
-\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
- //\r
- // Collect FvImage Info.\r
- //\r
- Status = PeiFfsGetVolumeInfo (FvImageHandle, &FvImageInfo);\r
- ASSERT_EFI_ERROR (Status);\r
- //\r
- // FvAlignment must be more than 8 bytes required by FvHeader structure.\r
- //\r
- FvAlignment = 1 << ((FvImageInfo.FvAttributes & EFI_FVB2_ALIGNMENT) >> 16);\r
- if (FvAlignment < 8) {\r
- FvAlignment = 8;\r
- }\r
- //\r
- // Check FvImage\r
- //\r
- if ((UINTN) FvImageInfo.FvStart % FvAlignment != 0) {\r
- FvBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINT32) FvImageInfo.FvSize), FvAlignment);\r
- if (FvBuffer == NULL) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
- CopyMem (FvBuffer, FvImageInfo.FvStart, (UINTN) FvImageInfo.FvSize);\r
- //\r
- // Update FvImageInfo after reload FvImage to new aligned memory\r
- //\r
- PeiFfsGetVolumeInfo ((EFI_PEI_FV_HANDLE) FvBuffer, &FvImageInfo);\r
- }\r
-\r
- //\r
- // Install FvPpi and Build FvHob\r
- //\r
- PiLibInstallFvInfoPpi (\r
- NULL,\r
- FvImageInfo.FvStart,\r
- (UINT32) FvImageInfo.FvSize,\r
- &(FvImageInfo.FvName),\r
- &(((EFI_FFS_FILE_HEADER*)FvFileHandle)->Name)\r
- );\r
-\r
- //\r
- // Inform HOB consumer phase, i.e. DXE core, the existance of this FV\r
- //\r
- BuildFvHob (\r
- (EFI_PHYSICAL_ADDRESS) (UINTN) FvImageInfo.FvStart,\r
- FvImageInfo.FvSize\r
- );\r
- //\r
- // Makes the encapsulated volume show up in DXE phase to skip processing of\r
- // encapsulated file again.\r
- //\r
- BuildFv2Hob (\r
- (EFI_PHYSICAL_ADDRESS) (UINTN) FvImageInfo.FvStart,\r
- FvImageInfo.FvSize,\r
- &FvImageInfo.FvName,\r
- &(((EFI_FFS_FILE_HEADER *)FvFileHandle)->Name)\r
- );\r
-\r
- return EFI_SUCCESS;\r
-}\r
projects / mirror_edk2.git / blobdiff