sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/Core/Pei: fix REGISITER -> REGISTER typo

Browse Source 
No functional changes.

Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Marc-André Lureau 2018-03-02 18:19:33 +01:00 committed by Laszlo Ersek
parent ab9e11da66
commit c2c4199bc2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
View File

@ -970,7 +970,7 @@ PeiDispatcher (
if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) { if ((Private->PeiMemoryInstalled) && (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {
// //
// Once real memory is available, shadow the RegisterForShadow modules. And meanwhile // Once real memory is available, shadow the RegisterForShadow modules. And meanwhile
// update the modules' status from PEIM_STATE_REGISITER_FOR_SHADOW to PEIM_STATE_DONE. // update the modules' status from PEIM_STATE_REGISTER_FOR_SHADOW to PEIM_STATE_DONE.
// //
SaveCurrentPeimCount = Private->CurrentPeimCount; SaveCurrentPeimCount = Private->CurrentPeimCount;
SaveCurrentFvCount = Private->CurrentPeimFvCount; SaveCurrentFvCount = Private->CurrentPeimFvCount;
@ -978,7 +978,7 @@ PeiDispatcher (
for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) { for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {
for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) { for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {
if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) { if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISTER_FOR_SHADOW) {
PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2]; PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];
Private->CurrentFileHandle = PeimFileHandle; Private->CurrentFileHandle = PeimFileHandle;
Private->CurrentPeimFvCount = Index1; Private->CurrentPeimFvCount = Index1;
@ -986,13 +986,13 @@ PeiDispatcher (
Status = PeiLoadImage ( Status = PeiLoadImage (
(CONST EFI_PEI_SERVICES **) &Private->Ps, (CONST EFI_PEI_SERVICES **) &Private->Ps,
PeimFileHandle, PeimFileHandle,
PEIM_STATE_REGISITER_FOR_SHADOW, PEIM_STATE_REGISTER_FOR_SHADOW,
&EntryPoint, &EntryPoint,
&AuthenticationState &AuthenticationState
); );
if (Status == EFI_SUCCESS) { if (Status == EFI_SUCCESS) {
// //
// PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE
// //
Private->Fv[Index1].PeimState[Index2]++; Private->Fv[Index1].PeimState[Index2]++;
// //
@ -1165,7 +1165,7 @@ PeiDispatcher (
// //
PeiCheckAndSwitchStack (SecCoreData, Private); PeiCheckAndSwitchStack (SecCoreData, Private);
if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW) && \ if ((Private->PeiMemoryInstalled) && (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW) && \
(Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) { (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {
// //
// If memory is available we shadow images by default for performance reasons. // If memory is available we shadow images by default for performance reasons.
@ -1179,7 +1179,7 @@ PeiDispatcher (
Status = PeiLoadImage ( Status = PeiLoadImage (
PeiServices, PeiServices,
PeimFileHandle, PeimFileHandle,
PEIM_STATE_REGISITER_FOR_SHADOW, PEIM_STATE_REGISTER_FOR_SHADOW,
&EntryPoint, &EntryPoint,
&AuthenticationState &AuthenticationState
); );
@ -1192,7 +1192,7 @@ PeiDispatcher (
//PERF_END (PeiServices, L"PEIM", PeimFileHandle, 0); //PERF_END (PeiServices, L"PEIM", PeimFileHandle, 0);
// //
// PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE
// //
Private->Fv[FvCount].PeimState[PeimCount]++; Private->Fv[FvCount].PeimState[PeimCount]++;
@ -1356,14 +1356,14 @@ PeiRegisterForShadow (
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
if (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] >= PEIM_STATE_REGISITER_FOR_SHADOW) { if (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] >= PEIM_STATE_REGISTER_FOR_SHADOW) {
// //
// If the PEIM has already entered the PEIM_STATE_REGISTER_FOR_SHADOW or PEIM_STATE_DONE then it's already been started // If the PEIM has already entered the PEIM_STATE_REGISTER_FOR_SHADOW or PEIM_STATE_DONE then it's already been started
// //
return EFI_ALREADY_STARTED; return EFI_ALREADY_STARTED;
} }
Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = PEIM_STATE_REGISITER_FOR_SHADOW; Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = PEIM_STATE_REGISTER_FOR_SHADOW;
return EFI_SUCCESS; return EFI_SUCCESS;
} }

4
MdeModulePkg/Core/Pei/Image/Image.c
View File

@ -387,7 +387,7 @@ LoadAndRelocatePeCoffImage (
} }
IsRegisterForShadow = FALSE; IsRegisterForShadow = FALSE;
if ((Private->CurrentFileHandle == FileHandle) if ((Private->CurrentFileHandle == FileHandle)
&& (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISITER_FOR_SHADOW)) { && (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW)) {
IsRegisterForShadow = TRUE; IsRegisterForShadow = TRUE;
} }
@ -876,7 +876,7 @@ PeiLoadImage (
// //
// The shadowed PEIM must be relocatable. // The shadowed PEIM must be relocatable.
// //
if (PeimState == PEIM_STATE_REGISITER_FOR_SHADOW) { if (PeimState == PEIM_STATE_REGISTER_FOR_SHADOW) {
IsStrip = RelocationIsStrip ((VOID *) (UINTN) ImageAddress); IsStrip = RelocationIsStrip ((VOID *) (UINTN) ImageAddress);
ASSERT (!IsStrip); ASSERT (!IsStrip);
if (IsStrip) { if (IsStrip) {

2
MdeModulePkg/Core/Pei/PeiMain.h
View File

@ -104,7 +104,7 @@ typedef struct {
// //
#define PEIM_STATE_NOT_DISPATCHED 0x00 #define PEIM_STATE_NOT_DISPATCHED 0x00
#define PEIM_STATE_DISPATCHED 0x01 #define PEIM_STATE_DISPATCHED 0x01
#define PEIM_STATE_REGISITER_FOR_SHADOW 0x02 #define PEIM_STATE_REGISTER_FOR_SHADOW 0x02
#define PEIM_STATE_DONE 0x03 #define PEIM_STATE_DONE 0x03
typedef struct { typedef struct {

2
MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
View File

@ -104,7 +104,7 @@ ShadowPeiCore (
Status = PeiLoadImage ( Status = PeiLoadImage (
GetPeiServicesTablePointer (), GetPeiServicesTablePointer (),
*((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle), *((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle),
PEIM_STATE_REGISITER_FOR_SHADOW, PEIM_STATE_REGISTER_FOR_SHADOW,
&EntryPoint, &EntryPoint,
&AuthenticationState &AuthenticationState
); );