REF : https://bugzilla.tianocore.org/show_bug.cgi?id=2542
ReportPreMemFv () has redundant calls to install Fsp FVs.
FSP-M, S, U FVs do not need to be installed
when Fsp Wrapper Boot Mode is disabled.
Signed-off-by: Miki Shindo <miki.shi...@intel.com>
Cc: Sai Chaganty <rangasai.v.chaga...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
---
Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
| 38 +++++++-------------------------------
Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
| 6 ------
2 files changed, 7 insertions(+), 37 deletions(-)
diff --git
a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
index 6158fc9412..95e3c88275 100644
---
a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
+++
b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c
@@ -20,17 +20,9 @@ ReportPreMemFv (
VOID
)
{
- if (!PcdGetBool(PcdFspWrapperBootMode)) {
- DEBUG ((DEBUG_INFO, "Install FlashFvFspM - 0x%x, 0x%x\n", PcdGet32
(PcdFlashFvFspMBase), PcdGet32 (PcdFlashFvFspMSize)));
- PeiServicesInstallFvInfo2Ppi (
- &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
(PcdFlashFvFspMBase))->FileSystemGuid),
- (VOID *) (UINTN) PcdGet32 (PcdFlashFvFspMBase),
- PcdGet32 (PcdFlashFvFspMSize),
- NULL,
- NULL,
- 0
- );
- }
+ /*
+ Note : FSP FVs are installed in IntelFsp2Wrapper Pkg or FspPkg in Dispatch
mode.
+ */
if (PcdGetBool(PcdFspWrapperBootMode)) {
DEBUG ((DEBUG_INFO, "Install FlashFvFspT - 0x%x, 0x%x\n", PcdGet32
(PcdFlashFvFspTBase), PcdGet32 (PcdFlashFvFspTSize)));
PeiServicesInstallFvInfo2Ppi (
@@ -80,6 +72,10 @@ ReportPostMemFv (
Status = PeiServicesGetBootMode (&BootMode);
ASSERT_EFI_ERROR (Status);
+ /*
+ Note : FSP FVs are installed in IntelFsp2Wrapper Pkg or FspPkg in Dispatch
mode.
+ */
+
///
/// Build HOB for DXE
///
@@ -97,26 +93,6 @@ ReportPostMemFv (
NULL,
0
);
- if (!PcdGetBool(PcdFspWrapperBootMode)) {
- DEBUG ((DEBUG_INFO, "Install FlashFvFspS - 0x%x, 0x%x\n", PcdGet32
(PcdFlashFvFspSBase), PcdGet32 (PcdFlashFvFspSSize)));
- PeiServicesInstallFvInfo2Ppi (
- &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
(PcdFlashFvFspSBase))->FileSystemGuid),
- (VOID *) (UINTN) PcdGet32 (PcdFlashFvFspSBase),
- PcdGet32 (PcdFlashFvFspSSize),
- NULL,
- NULL,
- 0
- );
- DEBUG ((DEBUG_INFO, "Install FlashFvFspU - 0x%x, 0x%x\n", PcdGet32
(PcdFlashFvFspUBase), PcdGet32 (PcdFlashFvFspUSize)));
- PeiServicesInstallFvInfo2Ppi (
- &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
(PcdFlashFvFspUBase))->FileSystemGuid),
- (VOID *) (UINTN) PcdGet32 (PcdFlashFvFspUBase),
- PcdGet32 (PcdFlashFvFspUSize),
- NULL,
- NULL,
- 0
- );
- }
DEBUG ((DEBUG_INFO, "Install FlashFvUefiBoot - 0x%x, 0x%x\n", PcdGet32
(PcdFlashFvUefiBootBase), PcdGet32 (PcdFlashFvUefiBootSize)));
PeiServicesInstallFvInfo2Ppi (
&(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
(PcdFlashFvUefiBootBase))->FileSystemGuid),
diff --git
a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
index 79cd5ee1f7..4258d0f2e7 100644
---
a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
+++
b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.inf
@@ -34,14 +34,8 @@
gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUBase ## CONSUMES
- gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize ## CONSUMES
gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase ## CONSUMES
--
2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55154): https://edk2.groups.io/g/devel/message/55154
Mute This Topic: https://groups.io/mt/71669890/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
