From: "Miki Shindo" <miki.shindo@intel.com>
To: devel@edk2.groups.io
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>,
Chasel Chiu <chasel.chiu@intel.com>,
Nate DeSimone <nathaniel.l.desimone@intel.com>,
Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-platform:PATCH v2] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation
Date: Mon, 2 Mar 2020 17:49:45 -0800 [thread overview]
Message-ID: <20200303014945.25312-1-miki.shindo@intel.com> (raw)
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..1fad384cd6 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 except FSP-T FV 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 except FSP-T FV 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
next reply other threads:[~2020-03-03 1:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 1:49 Miki Shindo [this message]
2020-03-03 3:59 ` [edk2-platform:PATCH v2] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation Chiu, Chasel
2020-03-03 4:04 ` Miki Shindo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200303014945.25312-1-miki.shindo@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox