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

MdeModulePkg PeiCore: PEI dispatcher need retry to process NOT_DISPATCHED FV

Browse Source 
A corner case like below will cause a NOT_DISPATCHED FV has no opportunity to
be dispatched.
  1. FV_RECOVERY has SecCore, PeiCore and some other PEI modules, a module will
    report FVMAIN_COMPACT and FV_RECOVERY2 in sequence.
  2. FVMAIN_COMPACT has a FV image file with GUIDED FV image section in it.
  3. FV_RECOVERY2 has DxeIpl and other PEI modules, the DxeIpl will install
     SectionExtractionPpi
  If ALL the PEIMs in FV_RECOVERY and FV_RECOVERY2 have DEPEX satisfied and
  executed in one loop, PeimNeedingDispatch will be always FALSE, FVMAIN_COMPACT
  will have no opportunity to be decompressed and dispatched as DxeIpl executes
  after the first processing to FVMAIN_COMPACT.

The patch is to set PeimNeedingDispatch to TRUE when ProcessFvFile() not successfully,
then the NOT_DISPATCHED FV could have another opportunity to be processed.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18781 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Star Zeng 2015-11-13 02:43:37 +00:00 committed by lzeng14
parent 9ea2d90187
commit 116cd8563c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1056,7 +1056,7 @@ PeiDispatcher (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
if (FvFileInfo.FileType == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) { if (FvFileInfo.FileType == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) {
// //
// For Fv type file, Produce new FV PPI and FV hob // For Fv type file, Produce new FvInfo PPI and FV hob
// //
Status = ProcessFvFile (Private, &Private->Fv[FvCount], PeimFileHandle); Status = ProcessFvFile (Private, &Private->Fv[FvCount], PeimFileHandle);
if (Status == EFI_SUCCESS) { if (Status == EFI_SUCCESS) {
@ -1065,6 +1065,13 @@ PeiDispatcher (
// //
Private->Fv[FvCount].PeimState[PeimCount]++; Private->Fv[FvCount].PeimState[PeimCount]++;
Private->PeimDispatchOnThisPass = TRUE; Private->PeimDispatchOnThisPass = TRUE;
} else {
//
// The related GuidedSectionExtraction/Decompress PPI for the
// encapsulated FV image section may be installed in the rest
// of this do-while loop, so need to make another pass.
//
Private->PeimNeedingDispatch = TRUE;
} }
} else { } else {
// //
@ -1192,11 +1199,11 @@ PeiDispatcher (
Private->CurrentPeimFvCount = 0; Private->CurrentPeimFvCount = 0;
// //
// PeimNeedingDispatch being TRUE means we found a PEIM that did not get // PeimNeedingDispatch being TRUE means we found a PEIM/FV that did not get
// dispatched. So we need to make another pass // dispatched. So we need to make another pass
// //
// PeimDispatchOnThisPass being TRUE means we dispatched a PEIM on this // PeimDispatchOnThisPass being TRUE means we dispatched a PEIM/FV on this
// pass. If we did not dispatch a PEIM there is no point in trying again // pass. If we did not dispatch a PEIM/FV there is no point in trying again
// as it will fail the next time too (nothing has changed). // as it will fail the next time too (nothing has changed).
// //
} while (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass); } while (Private->PeimNeedingDispatch && Private->PeimDispatchOnThisPass);