/** @file\r
Pei Core Main Entry Point\r
- \r
-Copyright (c) 2006 - 2010, 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
-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
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
**/\r
\r
PeiFfsFindNextFile,\r
PeiFfsFindSectionData,\r
\r
- PeiInstallPeiMemory, \r
+ PeiInstallPeiMemory,\r
PeiAllocatePages,\r
PeiAllocatePool,\r
(EFI_PEI_COPY_MEM)CopyMem,\r
PeiFfsFindFileByName,\r
PeiFfsGetFileInfo,\r
PeiFfsGetVolumeInfo,\r
- PeiRegisterForShadow\r
+ PeiRegisterForShadow,\r
+ PeiFfsFindSectionData3,\r
+ PeiFfsGetFileInfo2,\r
+ PeiResetSystem2,\r
+ PeiFreePages,\r
};\r
\r
/**\r
Shadow PeiCore module from flash to installed memory.\r
- \r
+\r
@param PrivateData PeiCore's private data structure\r
\r
@return PeiCore function address after shadowing.\r
IN PEI_CORE_INSTANCE *PrivateData\r
)\r
{\r
- EFI_PEI_FILE_HANDLE PeiCoreFileHandle;\r
- EFI_PHYSICAL_ADDRESS EntryPoint;\r
- EFI_STATUS Status;\r
- UINT32 AuthenticationState;\r
+ EFI_PEI_FILE_HANDLE PeiCoreFileHandle;\r
+ EFI_PHYSICAL_ADDRESS EntryPoint;\r
+ EFI_STATUS Status;\r
+ UINT32 AuthenticationState;\r
+ UINTN Index;\r
+ EFI_PEI_CORE_FV_LOCATION_PPI *PeiCoreFvLocationPpi;\r
+ UINTN PeiCoreFvIndex;\r
\r
PeiCoreFileHandle = NULL;\r
-\r
//\r
- // Find the PEI Core in the BFV\r
+ // Default PeiCore is in BFV\r
+ //\r
+ PeiCoreFvIndex = 0;\r
+ //\r
+ // Find the PEI Core either from EFI_PEI_CORE_FV_LOCATION_PPI indicated FV or BFV\r
+ //\r
+ Status = PeiServicesLocatePpi (\r
+ &gEfiPeiCoreFvLocationPpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID **) &PeiCoreFvLocationPpi\r
+ );\r
+ if (!EFI_ERROR (Status) && (PeiCoreFvLocationPpi->PeiCoreFvLocation != NULL)) {\r
+ //\r
+ // If PeiCoreFvLocation present, the PEI Core should be found from indicated FV\r
+ //\r
+ for (Index = 0; Index < PrivateData->FvCount; Index ++) {\r
+ if (PrivateData->Fv[Index].FvHandle == PeiCoreFvLocationPpi->PeiCoreFvLocation) {\r
+ PeiCoreFvIndex = Index;\r
+ break;\r
+ }\r
+ }\r
+ ASSERT (Index < PrivateData->FvCount);\r
+ }\r
+ //\r
+ // Find PEI Core from the given FV index\r
//\r
- Status = PrivateData->Fv[0].FvPpi->FindFileByType (\r
- PrivateData->Fv[0].FvPpi,\r
- EFI_FV_FILETYPE_PEI_CORE,\r
- PrivateData->Fv[0].FvHandle,\r
- &PeiCoreFileHandle\r
- );\r
+ Status = PrivateData->Fv[PeiCoreFvIndex].FvPpi->FindFileByType (\r
+ PrivateData->Fv[PeiCoreFvIndex].FvPpi,\r
+ EFI_FV_FILETYPE_PEI_CORE,\r
+ PrivateData->Fv[PeiCoreFvIndex].FvHandle,\r
+ &PeiCoreFileHandle\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
Status = PeiLoadImage (\r
GetPeiServicesTablePointer (),\r
*((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle),\r
- PEIM_STATE_REGISITER_FOR_SHADOW,\r
+ PEIM_STATE_REGISTER_FOR_SHADOW,\r
&EntryPoint,\r
&AuthenticationState\r
);\r
from SEC to PEI. After switching stack in the PEI core, it will restart\r
with the old core data.\r
\r
- @param SecCoreData Points to a data structure containing information about the PEI core's operating\r
+ @param SecCoreDataPtr 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 PpiList Points to a list of one or more PPI descriptors to be installed initially by the PEI core.\r
VOID\r
EFIAPI\r
PeiCore (\r
- IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData,\r
+ IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreDataPtr,\r
IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList,\r
IN VOID *Data\r
)\r
{\r
PEI_CORE_INSTANCE PrivateData;\r
+ EFI_SEC_PEI_HAND_OFF *SecCoreData;\r
+ EFI_SEC_PEI_HAND_OFF NewSecCoreData;\r
EFI_STATUS Status;\r
PEI_CORE_TEMP_POINTERS TempPtr;\r
- UINT64 Tick;\r
PEI_CORE_INSTANCE *OldCoreData;\r
EFI_PEI_CPU_IO_PPI *CpuIo;\r
EFI_PEI_PCI_CFG2_PPI *PciCfg;\r
EFI_HOB_HANDOFF_INFO_TABLE *HandoffInformationTable;\r
-\r
- Tick = 0;\r
- OldCoreData = (PEI_CORE_INSTANCE *)Data;\r
+ EFI_PEI_TEMPORARY_RAM_DONE_PPI *TemporaryRamDonePpi;\r
+ UINTN Index;\r
\r
//\r
- // Record the system tick for first entering PeiCore.\r
- // This tick is duration of executing platform seccore module.\r
- // \r
- if (PerformanceMeasurementEnabled()) {\r
- if (OldCoreData == NULL) {\r
- Tick = GetPerformanceCounter ();\r
- }\r
- }\r
+ // Retrieve context passed into PEI Core\r
+ //\r
+ OldCoreData = (PEI_CORE_INSTANCE *) Data;\r
+ SecCoreData = (EFI_SEC_PEI_HAND_OFF *) SecCoreDataPtr;\r
\r
- if (OldCoreData != NULL) {\r
+ //\r
+ // Perform PEI Core phase specific actions.\r
+ //\r
+ if (OldCoreData == NULL) {\r
+ //\r
+ // If OldCoreData is NULL, means current is the first entry into the PEI Core before memory is available.\r
+ //\r
+ ZeroMem (&PrivateData, sizeof (PEI_CORE_INSTANCE));\r
+ PrivateData.Signature = PEI_CORE_HANDLE_SIGNATURE;\r
+ CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
+ } else {\r
+ //\r
+ // Memory is available to the PEI Core. See if the PEI Core has been shadowed to memory yet.\r
+ //\r
if (OldCoreData->ShadowedPeiCore == NULL) {\r
- //\r
//\r
// Fixup the PeiCore's private data\r
//\r
- OldCoreData->Ps = &OldCoreData->ServiceTableShadow;\r
- OldCoreData->CpuIo = &OldCoreData->ServiceTableShadow.CpuIo;\r
+ OldCoreData->Ps = &OldCoreData->ServiceTableShadow;\r
+ OldCoreData->CpuIo = &OldCoreData->ServiceTableShadow.CpuIo;\r
if (OldCoreData->HeapOffsetPositive) {\r
OldCoreData->HobList.Raw = (VOID *)(OldCoreData->HobList.Raw + OldCoreData->HeapOffset);\r
+ if (OldCoreData->UnknownFvInfo != NULL) {\r
+ OldCoreData->UnknownFvInfo = (PEI_CORE_UNKNOW_FORMAT_FV_INFO *) ((UINT8 *) OldCoreData->UnknownFvInfo + OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->CurrentFvFileHandles != NULL) {\r
+ OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->CurrentFvFileHandles + OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.PpiList.PpiPtrs != NULL) {\r
+ OldCoreData->PpiData.PpiList.PpiPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.PpiList.PpiPtrs + OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs != NULL) {\r
+ OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs + OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs != NULL) {\r
+ OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs + OldCoreData->HeapOffset);\r
+ }\r
+ OldCoreData->Fv = (PEI_CORE_FV_HANDLE *) ((UINT8 *) OldCoreData->Fv + OldCoreData->HeapOffset);\r
+ for (Index = 0; Index < OldCoreData->FvCount; Index ++) {\r
+ if (OldCoreData->Fv[Index].PeimState != NULL) {\r
+ OldCoreData->Fv[Index].PeimState = (UINT8 *) OldCoreData->Fv[Index].PeimState + OldCoreData->HeapOffset;\r
+ }\r
+ if (OldCoreData->Fv[Index].FvFileHandles != NULL) {\r
+ OldCoreData->Fv[Index].FvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->Fv[Index].FvFileHandles + OldCoreData->HeapOffset);\r
+ }\r
+ }\r
+ OldCoreData->TempFileGuid = (EFI_GUID *) ((UINT8 *) OldCoreData->TempFileGuid + OldCoreData->HeapOffset);\r
+ OldCoreData->TempFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->TempFileHandles + OldCoreData->HeapOffset);\r
} else {\r
OldCoreData->HobList.Raw = (VOID *)(OldCoreData->HobList.Raw - OldCoreData->HeapOffset);\r
+ if (OldCoreData->UnknownFvInfo != NULL) {\r
+ OldCoreData->UnknownFvInfo = (PEI_CORE_UNKNOW_FORMAT_FV_INFO *) ((UINT8 *) OldCoreData->UnknownFvInfo - OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->CurrentFvFileHandles != NULL) {\r
+ OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->CurrentFvFileHandles - OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.PpiList.PpiPtrs != NULL) {\r
+ OldCoreData->PpiData.PpiList.PpiPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.PpiList.PpiPtrs - OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs != NULL) {\r
+ OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs - OldCoreData->HeapOffset);\r
+ }\r
+ if (OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs != NULL) {\r
+ OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *) ((UINT8 *) OldCoreData->PpiData.DispatchNotifyList.NotifyPtrs - OldCoreData->HeapOffset);\r
+ }\r
+ OldCoreData->Fv = (PEI_CORE_FV_HANDLE *) ((UINT8 *) OldCoreData->Fv - OldCoreData->HeapOffset);\r
+ for (Index = 0; Index < OldCoreData->FvCount; Index ++) {\r
+ if (OldCoreData->Fv[Index].PeimState != NULL) {\r
+ OldCoreData->Fv[Index].PeimState = (UINT8 *) OldCoreData->Fv[Index].PeimState - OldCoreData->HeapOffset;\r
+ }\r
+ if (OldCoreData->Fv[Index].FvFileHandles != NULL) {\r
+ OldCoreData->Fv[Index].FvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->Fv[Index].FvFileHandles - OldCoreData->HeapOffset);\r
+ }\r
+ }\r
+ OldCoreData->TempFileGuid = (EFI_GUID *) ((UINT8 *) OldCoreData->TempFileGuid - OldCoreData->HeapOffset);\r
+ OldCoreData->TempFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->TempFileHandles - OldCoreData->HeapOffset);\r
}\r
\r
//\r
SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);\r
\r
//\r
- // Update HandOffHob for new installed permenent memory\r
+ // Initialize libraries that the PEI Core is linked against\r
+ //\r
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);\r
+\r
+ //\r
+ // Update HandOffHob for new installed permanent memory\r
//\r
HandoffInformationTable = OldCoreData->HobList.HandoffInformationTable;\r
if (OldCoreData->HeapOffsetPositive) {\r
HandoffInformationTable->EfiFreeMemoryBottom = HandoffInformationTable->EfiEndOfHobList + sizeof (EFI_HOB_GENERIC_HEADER);\r
\r
//\r
- // We need convert the PPI desciptor's pointer\r
+ // We need convert MemoryBaseAddress in memory allocation HOBs\r
+ //\r
+ ConvertMemoryAllocationHobs (OldCoreData);\r
+\r
+ //\r
+ // We need convert the PPI descriptor's pointer\r
//\r
- ConvertPpiPointers (OldCoreData, (UINTN)SecCoreData->TemporaryRamBase, (UINTN)SecCoreData->TemporaryRamBase + SecCoreData->TemporaryRamSize, OldCoreData->HeapOffset, OldCoreData->HeapOffsetPositive);\r
+ ConvertPpiPointers (SecCoreData, OldCoreData);\r
\r
//\r
// After the whole temporary memory is migrated, then we can allocate page in\r
- // permenent memory.\r
+ // permanent memory.\r
//\r
OldCoreData->PeiMemoryInstalled = TRUE;\r
\r
// Indicate that PeiCore reenter\r
//\r
OldCoreData->PeimDispatcherReenter = TRUE;\r
- \r
+\r
if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (OldCoreData->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\r
//\r
// if Loading Module at Fixed Address is enabled, allocate the PEI code memory range usage bit map array.\r
OldCoreData->PeiCodeMemoryRangeUsageBitMap = AllocateZeroPool (((PcdGet32(PcdLoadFixAddressPeiCodePageNumber)>>6) + 1)*sizeof(UINT64));\r
}\r
\r
- //\r
- // Process the Notify list and dispatch any notifies for\r
- // newly installed PPIs.\r
- //\r
- ProcessNotifyList (OldCoreData);\r
-\r
//\r
// Shadow PEI Core. When permanent memory is avaiable, shadow\r
// PEI Core and PEIMs to get high performance.\r
//\r
- OldCoreData->ShadowedPeiCore = ShadowPeiCore (OldCoreData);\r
- \r
+ OldCoreData->ShadowedPeiCore = (PEICORE_FUNCTION_POINTER) (UINTN) PeiCore;\r
+ if ((HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnS3Boot))\r
+ || (HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnBoot))) {\r
+ OldCoreData->ShadowedPeiCore = ShadowPeiCore (OldCoreData);\r
+ }\r
+\r
//\r
- // PeiCore has been shadowed to memory for first entering, so\r
- // just jump to PeiCore in memory here.\r
+ // PEI Core has now been shadowed to memory. Restart PEI Core in memory.\r
//\r
OldCoreData->ShadowedPeiCore (SecCoreData, PpiList, OldCoreData);\r
+\r
+ //\r
+ // Should never reach here.\r
+ //\r
+ ASSERT (FALSE);\r
+ CpuDeadLoop();\r
+\r
+ UNREACHABLE ();\r
}\r
\r
+ //\r
+ // Memory is available to the PEI Core and the PEI Core has been shadowed to memory.\r
+ //\r
+ CopyMem (&NewSecCoreData, SecCoreDataPtr, sizeof (NewSecCoreData));\r
+ SecCoreData = &NewSecCoreData;\r
+\r
CopyMem (&PrivateData, OldCoreData, sizeof (PrivateData));\r
- \r
+\r
CpuIo = (VOID*)PrivateData.ServiceTableShadow.CpuIo;\r
PciCfg = (VOID*)PrivateData.ServiceTableShadow.PciCfg;\r
- \r
+\r
CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
- \r
+\r
PrivateData.ServiceTableShadow.CpuIo = CpuIo;\r
PrivateData.ServiceTableShadow.PciCfg = PciCfg;\r
- } else {\r
- //\r
- // If OldCoreData is NULL, means current is first Peicore's entering.\r
- //\r
- \r
- ZeroMem (&PrivateData, sizeof (PEI_CORE_INSTANCE));\r
- PrivateData.Signature = PEI_CORE_HANDLE_SIGNATURE;\r
- CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
}\r
\r
+ //\r
+ // Cache a pointer to the PEI Services Table that is either in temporary memory or permanent memory\r
+ //\r
PrivateData.Ps = &PrivateData.ServiceTableShadow;\r
\r
//\r
- // Initialize libraries that the PeiCore is linked against\r
+ // Save PeiServicePointer so that it can be retrieved anywhere.\r
//\r
- ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);\r
-\r
- InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
+ SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&PrivateData.Ps);\r
\r
- InitializePpiServices (&PrivateData, OldCoreData);\r
+ //\r
+ // Initialize libraries that the PEI Core is linked against\r
+ //\r
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);\r
\r
//\r
- // Save PeiServicePointer so that it can be retrieved anywhere.\r
+ // Initialize PEI Core Services\r
//\r
- SetPeiServicesTablePointer((CONST EFI_PEI_SERVICES **) &PrivateData.Ps);\r
- \r
- if (OldCoreData != NULL) {\r
+ InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
\r
- PERF_END (NULL,"PreMem", NULL, 0);\r
- PERF_START (NULL,"PostMem", NULL, 0);\r
+ //\r
+ // Update performance measurements\r
+ //\r
+ if (OldCoreData == NULL) {\r
+ PERF_EVENT ("SEC"); // Means the end of SEC phase.\r
\r
//\r
- // Alert any listeners that there is permanent memory available\r
+ // If first pass, start performance measurement.\r
//\r
- \r
- PERF_START (NULL,"DisMem", NULL, 0);\r
- Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);\r
- PERF_END (NULL,"DisMem", NULL, 0);\r
+ PERF_CROSSMODULE_BEGIN ("PEI");\r
+ PERF_INMODULE_BEGIN ("PreMem");\r
\r
} else {\r
+ PERF_INMODULE_END ("PreMem");\r
+ PERF_INMODULE_BEGIN ("PostMem");\r
+ }\r
+\r
+ //\r
+ // Complete PEI Core Service initialization\r
+ //\r
+ InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
+ InitializeDispatcherData (&PrivateData, OldCoreData, SecCoreData);\r
+ InitializeImageServices (&PrivateData, OldCoreData);\r
\r
+ //\r
+ // Perform PEI Core Phase specific actions\r
+ //\r
+ if (OldCoreData == NULL) {\r
//\r
// Report Status Code EFI_SW_PC_INIT\r
//\r
EFI_PROGRESS_CODE,\r
(EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)\r
);\r
- \r
- PERF_START (NULL, "SEC", NULL, 1);\r
- PERF_END (NULL, "SEC", NULL, Tick);\r
\r
- PERF_START (NULL,"PEI", NULL, Tick);\r
//\r
- // If first pass, start performance measurement.\r
+ // If SEC provided the PpiList, process it.\r
//\r
- PERF_START (NULL,"PreMem", NULL, Tick);\r
-\r
+ if (PpiList != NULL) {\r
+ ProcessPpiListFromSec ((CONST EFI_PEI_SERVICES **) &PrivateData.Ps, PpiList);\r
+ }\r
+ } else {\r
//\r
- // If SEC provided any PPI services to PEI, install them.\r
+ // Try to locate Temporary RAM Done Ppi.\r
//\r
- if (PpiList != NULL) {\r
- Status = PeiServicesInstallPpi (PpiList);\r
- ASSERT_EFI_ERROR (Status);\r
+ Status = PeiServicesLocatePpi (\r
+ &gEfiTemporaryRamDonePpiGuid,\r
+ 0,\r
+ NULL,\r
+ (VOID**)&TemporaryRamDonePpi\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Disable the use of Temporary RAM after the transition from Temporary RAM to Permanent RAM is complete.\r
+ //\r
+ TemporaryRamDonePpi->TemporaryRamDone ();\r
}\r
- }\r
\r
- InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
+ //\r
+ // Alert any listeners that there is permanent memory available\r
+ //\r
+ PERF_INMODULE_BEGIN ("DisMem");\r
+ Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);\r
\r
- InitializeDispatcherData (&PrivateData, OldCoreData, SecCoreData);\r
+ //\r
+ // Process the Notify list and dispatch any notifies for the Memory Discovered PPI\r
+ //\r
+ ProcessDispatchNotifyList (&PrivateData);\r
\r
- //\r
- // Install Pei Load File PPI. \r
- //\r
- InitializeImageServices (&PrivateData, OldCoreData);\r
+ PERF_INMODULE_END ("DisMem");\r
+ }\r
\r
//\r
// Call PEIM dispatcher\r
//\r
PeiDispatcher (SecCoreData, &PrivateData);\r
\r
+ if (PrivateData.HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) {\r
+ //\r
+ // Check if InstallPeiMemory service was called on non-S3 resume boot path.\r
+ //\r
+ ASSERT(PrivateData.PeiMemoryInstalled == TRUE);\r
+ }\r
+\r
//\r
- // Check if InstallPeiMemory service was called.\r
+ // Measure PEI Core execution time.\r
//\r
- ASSERT(PrivateData.PeiMemoryInstalled == TRUE);\r
+ PERF_INMODULE_END ("PostMem");\r
\r
//\r
- // Till now, PEI phase will be finished, get performace count\r
- // for computing duration of PEI phase\r
+ // Lookup DXE IPL PPI\r
//\r
- PERF_END (NULL, "PostMem", NULL, 0);\r
-\r
Status = PeiServicesLocatePpi (\r
&gEfiDxeIplPpiGuid,\r
0,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Report status code to indicate DXE IPL PPI could not be found.\r
+ //\r
+ REPORT_STATUS_CODE (\r
+ EFI_ERROR_CODE | EFI_ERROR_MAJOR,\r
+ (EFI_SOFTWARE_PEI_CORE | EFI_SW_PEI_CORE_EC_DXEIPL_NOT_FOUND)\r
+ );\r
+ CpuDeadLoop ();\r
+ }\r
+\r
//\r
// Enter DxeIpl to load Dxe core.\r
//\r
//\r
ASSERT_EFI_ERROR (Status);\r
CpuDeadLoop();\r
-}\r
-\r
\r
+ UNREACHABLE ();\r
+}\r
projects / mirror_edk2.git / blobdiff