From nobody Wed May 1 12:56:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55283+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55283+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1583200563; cv=none; d=zohomail.com; s=zohoarc; b=GvomYr3pdaWtLJkLtgnpLJut9rQ8fUfA+smzpPb0XDOPbHl4CIlrMM4e09hgrUW4d2ZcZtBsMz+cfyNtScXGPUS9+L+pCuvybxDu6KrvpnYQHLb1JXINi77LFyTcqbQVbmUTw3+OKcBcy0rKevRGaQg9+r70NIGx5eIDJNXdudA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583200563; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=sA4Fd50hXy6JUavMgWsPjPGgj+QSBQaGHBIvdyzzJJQ=; b=RuKiKX5Ve2oqm/gtjuT7EAR8FPH03Ay9NRh4A2LB0F805f2QLz11aOPO2Z78zk/2rZ+mOLsnm8HD/yVaEOxeXiQAOtKKs9y0vhUvFcs9lOsUxp6dmMxJAGwNMCxZ55ofRwZH3gcZx/O+W+kmJVApP86eUF4AbIwGA7xMb0yY8Y4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55283+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1583200563231120.20073191898632; Mon, 2 Mar 2020 17:56:03 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Lpk3YY1788612xZaZhqR047B; Mon, 02 Mar 2020 17:56:02 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web09.6011.1583200561274881031 for ; Mon, 02 Mar 2020 17:56:01 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2020 17:56:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,509,1574150400"; d="scan'208";a="286835102" X-Received: from mshindo-desk2.amr.corp.intel.com ([10.9.69.166]) by FMSMGA003.fm.intel.com with ESMTP; 02 Mar 2020 17:56:00 -0800 From: "Miki Shindo" To: devel@edk2.groups.io Cc: Sai Chaganty , Chasel Chiu , Nate DeSimone , Prince Agyeman Subject: [edk2-devel] [edk2-platform:PATCH v2] MinPlatformPkg/PeiReportFvLib: Remove redundant Fsp Fv installation Date: Mon, 2 Mar 2020 17:49:45 -0800 Message-Id: <20200303014945.25312-1-miki.shindo@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,miki.shindo@intel.com X-Gm-Message-State: ZiBL9p0gIYAURVF7QE4WU7LPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1583200562; bh=daYlo9WGi3J6vB4BHeu6F7dbeROImNPJ5ghl0+ojUAk=; h=Cc:Date:From:Reply-To:Subject:To; b=vwoXelTZq7xupOCI87CQYH64s1eKfIHQnZB44CbIj1Rb8h+T0ki/ww9aYtknmtCJBJY IDrsdiAjDTduRRiaQMuh/Uir7pPpuhArGlrnooluGyxbj8czNUzyNP0ZxZsKKwX8fHhnk EjMAhA/AQCJ4+ysD91NQ3OaPry+PZqHwvUs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF : https://bugzilla.tianocore.org/show_bug.cgi?id=3D2542 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 Cc: Sai Chaganty Cc: Chasel Chiu Cc: Nate DeSimone Cc: Prince Agyeman --- Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRepor= tFvLib.c | 38 +++++++------------------------------- Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRepor= tFvLib.inf | 6 ------ 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFv= Lib/PeiReportFvLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/P= eiReportFvLib/PeiReportFvLib.c index 6158fc9412..1fad384cd6 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.c @@ -20,17 +20,9 @@ ReportPreMemFv ( VOID ) { - if (!PcdGetBool(PcdFspWrapperBootMode)) { - DEBUG ((DEBUG_INFO, "Install FlashFvFspM - 0x%x, 0x%x\n", PcdGet32 (Pc= dFlashFvFspMBase), PcdGet32 (PcdFlashFvFspMSize))); - PeiServicesInstallFvInfo2Ppi ( - &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFlashFvFspMBa= se))->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 (Pc= dFlashFvFspTBase), PcdGet32 (PcdFlashFvFspTSize))); PeiServicesInstallFvInfo2Ppi ( @@ -80,6 +72,10 @@ ReportPostMemFv ( Status =3D PeiServicesGetBootMode (&BootMode); ASSERT_EFI_ERROR (Status); =20 + /// + /// 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 (PcdFlashFvFspS= Base))->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 (PcdFlashFvFspU= Base))->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 (PcdFlashFvUefiBo= otBase))->FileSystemGuid), diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFv= Lib/PeiReportFvLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library= /PeiReportFvLib/PeiReportFvLib.inf index 79cd5ee1f7..4258d0f2e7 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.inf +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.inf @@ -34,14 +34,8 @@ gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUBase ## CONSU= MES - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize ## CONSU= MES gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootBase ## CONSU= MES --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55283): https://edk2.groups.io/g/devel/message/55283 Mute This Topic: https://groups.io/mt/71690962/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-