Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
Thanks, Chasel > -----Original Message----- > From: Tan, Ming <ming....@intel.com> > Sent: Sunday, May 21, 2023 11:13 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Duggapu, Chinni B > <chinni.b.dugg...@intel.com> > Subject: [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4458 > > Original code call PeiServicesInstallFvInfoPpi() with NULL for the FvFormat > parameter, then PeiServicesInstallFvInfoPpi() will assume it use FFS2, then > ASSERT if FSP-S/M use FFS3. > Now set the FvFormat to the info got from FvHeader. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Duggapu Chinni B <chinni.b.dugg...@intel.com> > Signed-off-by: Ming Tan <ming....@intel.com> > --- > IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 2 +- > IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > index ea206a7960..ba0c742fea 100644 > --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > @@ -217,7 +217,7 @@ FspmWrapperInit ( > ASSERT_EFI_ERROR (Status); PeiServicesInstallFvInfoPpi (- > NULL,+ > &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 > (PcdFspmBaseAddress))->FileSystemGuid, (VOID *)(UINTN)PcdGet32 > (PcdFspmBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER > *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength, NULL,diff --git > a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > index 091ddb697a..08fe0fdb7e 100644 > --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > @@ -438,7 +438,7 @@ FspsWrapperInitDispatchMode ( > // FSP-S Wrapper running in Dispatch mode and reports FSP-S FV to PEI > dispatcher. // PeiServicesInstallFvInfoPpi (- NULL,+ > &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 > (PcdFspsBaseAddress))->FileSystemGuid, (VOID *)(UINTN)PcdGet32 > (PcdFspsBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER > *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength, NULL,-- > 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105134): https://edk2.groups.io/g/devel/message/105134 Mute This Topic: https://groups.io/mt/99059532/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
