\r
#include "PeiMain.h"\r
\r
-EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {\r
+EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {\r
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
&gEfiPeiMemoryDiscoveredPpiGuid,\r
NULL\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
- UINTN Index;\r
- EFI_PEI_CORE_FV_LOCATION_PPI *PeiCoreFvLocationPpi;\r
- UINTN PeiCoreFvIndex;\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
&gEfiPeiCoreFvLocationPpiGuid,\r
0,\r
NULL,\r
- (VOID **) &PeiCoreFvLocationPpi\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
+ for (Index = 0; Index < PrivateData->FvCount; Index++) {\r
if (PrivateData->Fv[Index].FvHandle == PeiCoreFvLocationPpi->PeiCoreFvLocation) {\r
PeiCoreFvIndex = Index;\r
break;\r
}\r
}\r
+\r
ASSERT (Index < PrivateData->FvCount);\r
}\r
+\r
//\r
// Find PEI Core from the given FV index\r
//\r
// Shadow PEI Core into memory so it will run faster\r
//\r
Status = PeiLoadImage (\r
- GetPeiServicesTablePointer (),\r
- *((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle),\r
- PEIM_STATE_REGISTER_FOR_SHADOW,\r
- &EntryPoint,\r
- &AuthenticationState\r
- );\r
+ GetPeiServicesTablePointer (),\r
+ *((EFI_PEI_FILE_HANDLE *)&PeiCoreFileHandle),\r
+ PEIM_STATE_REGISTER_FOR_SHADOW,\r
+ &EntryPoint,\r
+ &AuthenticationState\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Compute the PeiCore's function address after shadowed PeiCore.\r
// _ModuleEntryPoint is PeiCore main function entry\r
//\r
- return (PEICORE_FUNCTION_POINTER)((UINTN) EntryPoint + (UINTN) PeiCore - (UINTN) _ModuleEntryPoint);\r
+ return (PEICORE_FUNCTION_POINTER)((UINTN)EntryPoint + (UINTN)PeiCore - (UINTN)_ModuleEntryPoint);\r
}\r
\r
/**\r
VOID\r
EFIAPI\r
PeiCore (\r
- IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreDataPtr,\r
- IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList,\r
- IN VOID *Data\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
- 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
- EFI_PEI_TEMPORARY_RAM_DONE_PPI *TemporaryRamDonePpi;\r
- UINTN Index;\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
+ 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
+ EFI_PEI_TEMPORARY_RAM_DONE_PPI *TemporaryRamDonePpi;\r
+ UINTN Index;\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
+ OldCoreData = (PEI_CORE_INSTANCE *)Data;\r
+ SecCoreData = (EFI_SEC_PEI_HAND_OFF *)SecCoreDataPtr;\r
\r
//\r
// Perform PEI Core phase specific actions.\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
+ OldCoreData->UnknownFvInfo = (PEI_CORE_UNKNOW_FORMAT_FV_INFO *)((UINT8 *)OldCoreData->UnknownFvInfo + OldCoreData->HeapOffset);\r
}\r
+\r
if (OldCoreData->CurrentFvFileHandles != NULL) {\r
- OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->CurrentFvFileHandles + OldCoreData->HeapOffset);\r
+ OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *)((UINT8 *)OldCoreData->CurrentFvFileHandles + OldCoreData->HeapOffset);\r
}\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
+ OldCoreData->PpiData.PpiList.PpiPtrs = (PEI_PPI_LIST_POINTERS *)((UINT8 *)OldCoreData->PpiData.PpiList.PpiPtrs + OldCoreData->HeapOffset);\r
}\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
+ OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *)((UINT8 *)OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs + OldCoreData->HeapOffset);\r
}\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
+ 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
+\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
+ OldCoreData->Fv[Index].PeimState = (UINT8 *)OldCoreData->Fv[Index].PeimState + OldCoreData->HeapOffset;\r
}\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
+ 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
+ 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
+ OldCoreData->UnknownFvInfo = (PEI_CORE_UNKNOW_FORMAT_FV_INFO *)((UINT8 *)OldCoreData->UnknownFvInfo - OldCoreData->HeapOffset);\r
}\r
+\r
if (OldCoreData->CurrentFvFileHandles != NULL) {\r
- OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *) ((UINT8 *) OldCoreData->CurrentFvFileHandles - OldCoreData->HeapOffset);\r
+ OldCoreData->CurrentFvFileHandles = (EFI_PEI_FILE_HANDLE *)((UINT8 *)OldCoreData->CurrentFvFileHandles - OldCoreData->HeapOffset);\r
}\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
+ OldCoreData->PpiData.PpiList.PpiPtrs = (PEI_PPI_LIST_POINTERS *)((UINT8 *)OldCoreData->PpiData.PpiList.PpiPtrs - OldCoreData->HeapOffset);\r
}\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
+ OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs = (PEI_PPI_LIST_POINTERS *)((UINT8 *)OldCoreData->PpiData.CallbackNotifyList.NotifyPtrs - OldCoreData->HeapOffset);\r
}\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
+ 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
+\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
+ OldCoreData->Fv[Index].PeimState = (UINT8 *)OldCoreData->Fv[Index].PeimState - OldCoreData->HeapOffset;\r
}\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
+ 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
+ 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
//\r
HandoffInformationTable = OldCoreData->HobList.HandoffInformationTable;\r
if (OldCoreData->HeapOffsetPositive) {\r
- HandoffInformationTable->EfiEndOfHobList = HandoffInformationTable->EfiEndOfHobList + OldCoreData->HeapOffset;\r
+ HandoffInformationTable->EfiEndOfHobList = HandoffInformationTable->EfiEndOfHobList + OldCoreData->HeapOffset;\r
} else {\r
- HandoffInformationTable->EfiEndOfHobList = HandoffInformationTable->EfiEndOfHobList - OldCoreData->HeapOffset;\r
+ HandoffInformationTable->EfiEndOfHobList = HandoffInformationTable->EfiEndOfHobList - OldCoreData->HeapOffset;\r
}\r
+\r
HandoffInformationTable->EfiMemoryTop = OldCoreData->PhysicalMemoryBegin + OldCoreData->PhysicalMemoryLength;\r
HandoffInformationTable->EfiMemoryBottom = OldCoreData->PhysicalMemoryBegin;\r
HandoffInformationTable->EfiFreeMemoryTop = OldCoreData->FreePhysicalMemoryTop;\r
//\r
OldCoreData->PeimDispatcherReenter = TRUE;\r
\r
- if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0 && (OldCoreData->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME)) {\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
// Every bit in the array indicate the status of the corresponding memory page available or not\r
//\r
- OldCoreData->PeiCodeMemoryRangeUsageBitMap = AllocateZeroPool (((PcdGet32(PcdLoadFixAddressPeiCodePageNumber)>>6) + 1)*sizeof(UINT64));\r
+ OldCoreData->PeiCodeMemoryRangeUsageBitMap = AllocateZeroPool (((PcdGet32 (PcdLoadFixAddressPeiCodePageNumber)>>6) + 1)*sizeof (UINT64));\r
}\r
\r
//\r
// Shadow PEI Core. When permanent memory is available, shadow\r
// PEI Core and PEIMs to get high performance.\r
//\r
- OldCoreData->ShadowedPeiCore = (PEICORE_FUNCTION_POINTER) (UINTN) PeiCore;\r
+ OldCoreData->ShadowedPeiCore = (PEICORE_FUNCTION_POINTER)(UINTN)PeiCore;\r
if (PcdGetBool (PcdMigrateTemporaryRamFirmwareVolumes) ||\r
- (HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnS3Boot)) ||\r
- (HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME && PcdGetBool (PcdShadowPeimOnBoot))) {\r
+ ((HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnS3Boot)) ||\r
+ ((HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME) && PcdGetBool (PcdShadowPeimOnBoot)))\r
+ {\r
OldCoreData->ShadowedPeiCore = ShadowPeiCore (OldCoreData);\r
}\r
\r
// Should never reach here.\r
//\r
ASSERT (FALSE);\r
- CpuDeadLoop();\r
+ CpuDeadLoop ();\r
\r
UNREACHABLE ();\r
}\r
\r
CopyMem (&PrivateData, OldCoreData, sizeof (PrivateData));\r
\r
- CpuIo = (VOID*)PrivateData.ServiceTableShadow.CpuIo;\r
- PciCfg = (VOID*)PrivateData.ServiceTableShadow.PciCfg;\r
+ CpuIo = (VOID *)PrivateData.ServiceTableShadow.CpuIo;\r
+ PciCfg = (VOID *)PrivateData.ServiceTableShadow.PciCfg;\r
\r
CopyMem (&PrivateData.ServiceTableShadow, &gPs, sizeof (gPs));\r
\r
//\r
// Initialize PEI Core Services\r
//\r
- InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
+ InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
\r
//\r
// Update performance measurements\r
//\r
PERF_CROSSMODULE_BEGIN ("PEI");\r
PERF_INMODULE_BEGIN ("PreMem");\r
-\r
} else {\r
PERF_INMODULE_END ("PreMem");\r
PERF_INMODULE_BEGIN ("PostMem");\r
// Complete PEI Core Service initialization\r
//\r
InitializeSecurityServices (&PrivateData.Ps, OldCoreData);\r
- InitializeDispatcherData (&PrivateData, OldCoreData, SecCoreData);\r
- InitializeImageServices (&PrivateData, OldCoreData);\r
+ InitializeDispatcherData (&PrivateData, OldCoreData, SecCoreData);\r
+ InitializeImageServices (&PrivateData, OldCoreData);\r
\r
//\r
// Perform PEI Core Phase specific actions\r
// If SEC provided the PpiList, process it.\r
//\r
if (PpiList != NULL) {\r
- ProcessPpiListFromSec ((CONST EFI_PEI_SERVICES **) &PrivateData.Ps, PpiList);\r
+ ProcessPpiListFromSec ((CONST EFI_PEI_SERVICES **)&PrivateData.Ps, PpiList);\r
}\r
} else {\r
if (PcdGetBool (PcdMigrateTemporaryRamFirmwareVolumes)) {\r
&gEfiTemporaryRamDonePpiGuid,\r
0,\r
NULL,\r
- (VOID**)&TemporaryRamDonePpi\r
+ (VOID **)&TemporaryRamDonePpi\r
);\r
if (!EFI_ERROR (Status)) {\r
//\r
//\r
// Check if InstallPeiMemory service was called on non-S3 resume boot path.\r
//\r
- ASSERT(PrivateData.PeiMemoryInstalled == TRUE);\r
+ ASSERT (PrivateData.PeiMemoryInstalled == TRUE);\r
}\r
\r
//\r
// Should never reach here.\r
//\r
ASSERT_EFI_ERROR (Status);\r
- CpuDeadLoop();\r
+ CpuDeadLoop ();\r
\r
UNREACHABLE ();\r
}\r
projects / mirror_edk2.git / blobdiff