/** @file\r
EFI PEI Core dispatch services\r
\r
-Copyright (c) 2006 - 2009, Intel Corporation\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
Apriori file in one FV.\r
\r
\r
- @param Private - Pointer to the private data passed in from caller\r
- @param VolumeHandle - Fv handle.\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
VOID\r
DiscoverPeimsAndOrderWithApriori (\r
IN PEI_CORE_INSTANCE *Private,\r
- IN EFI_PEI_FV_HANDLE VolumeHandle\r
+ IN PEI_CORE_FV_HANDLE *CoreFileHandle\r
)\r
{\r
EFI_STATUS Status;\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
// 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 < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv));\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
ZeroMem (FileGuid, sizeof (FileGuid));\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
// 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
UINT32 Index1;\r
UINT32 Index2;\r
CONST EFI_PEI_SERVICES **PeiServices;\r
- EFI_PEI_FV_HANDLE VolumeHandle;\r
EFI_PEI_FILE_HANDLE PeimFileHandle;\r
UINTN FvCount;\r
UINTN PeimCount;\r
EFI_FV_FILE_INFO FvFileInfo;\r
UINTN OldCheckingTop;\r
UINTN OldCheckingBottom;\r
-\r
+ PEI_CORE_FV_HANDLE *CoreFvHandle;\r
\r
PeiServices = (CONST EFI_PEI_SERVICES **) &Private->PS;\r
PeimEntryPoint = NULL;\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
(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
}\r
\r
for (FvCount = Private->CurrentPeimFvCount; FvCount < Private->FvCount; FvCount++) {\r
- Private->CurrentPeimFvCount = FvCount;\r
+ CoreFvHandle = FindNextCoreFvHandle (Private, FvCount);\r
+ ASSERT (CoreFvHandle != NULL);\r
+ \r
//\r
- // Get this Fv Handle by PeiService FvFindNextVolume.\r
+ // If the FV has corresponding EFI_PEI_FIRMWARE_VOLUME_PPI instance, then dispatch it.\r
//\r
- PeiFvFindNextVolume (PeiServices, FvCount, &VolumeHandle);\r
+ if (CoreFvHandle->FvPpi == NULL) {\r
+ continue;\r
+ }\r
+ \r
+ Private->CurrentPeimFvCount = FvCount;\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
if (!DepexSatisfied (Private, PeimFileHandle, PeimCount)) {\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, VolumeHandle, 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
\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
//\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
if (OldCoreData == NULL) {\r
PrivateData->PeimDispatcherReenter = FALSE;\r
PeiInitializeFv (PrivateData, SecCoreData);\r
+ } else {\r
+ PeiReinitializeFv (PrivateData);\r
}\r
\r
return;\r
return EFI_SUCCESS;\r
}\r
\r
+\r
+\r
projects / mirror_edk2.git / blobdiff