* [edk2-platforms:PATCH] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation
@ 2020-03-02 8:40 Miki Shindo
2020-03-02 22:59 ` Nate DeSimone
0 siblings, 1 reply; 2+ messages in thread
From: Miki Shindo @ 2020-03-02 8:40 UTC (permalink / raw)
To: devel; +Cc: Sai Chaganty, Chasel Chiu, Nate DeSimone, Prince Agyeman
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.shindo@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Prince Agyeman <prince.agyeman@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [edk2-platforms:PATCH] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation
2020-03-02 8:40 [edk2-platforms:PATCH] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation Miki Shindo
@ 2020-03-02 22:59 ` Nate DeSimone
0 siblings, 0 replies; 2+ messages in thread
From: Nate DeSimone @ 2020-03-02 22:59 UTC (permalink / raw)
To: Shindo, Miki
Cc: devel@edk2.groups.io, Chaganty, Rangasai V, Chiu, Chasel,
Agyeman, Prince
Hi Shindo-san,
Please see my feedback inline.
Thanks,
Nate
On Mon, Mar 02, 2020 at 08:40:42AM +0000, Shindo, Miki wrote:
> 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.shindo@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Prince Agyeman <prince.agyeman@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);
>
Please use the "///" style comments to maintain consistency with the
other code in this file.
> + /*
> + 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-02 22:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-02 8:40 [edk2-platforms:PATCH] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation Miki Shindo
2020-03-02 22:59 ` Nate DeSimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox