From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.491.1582786694581981639 for ; Wed, 26 Feb 2020 22:58:14 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2020 22:58:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,491,1574150400"; d="scan'208";a="232076926" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga008.fm.intel.com with ESMTP; 26 Feb 2020 22:58:13 -0800 Received: from orsmsx123.amr.corp.intel.com (10.22.240.116) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 26 Feb 2020 22:58:12 -0800 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.140]) by ORSMSX123.amr.corp.intel.com ([169.254.1.182]) with mapi id 14.03.0439.000; Wed, 26 Feb 2020 22:58:12 -0800 From: "Nate DeSimone" To: "Shindo, Miki" , "devel@edk2.groups.io" CC: "Chaganty, Rangasai V" , "Chiu, Chasel" , "Agyeman, Prince" Subject: Re: [edk2-platforms: PATCH] MinPlatformPkg/PeiReportFvLib: Install FvFspT in PeiReportFvLib Thread-Topic: [edk2-platforms: PATCH] MinPlatformPkg/PeiReportFvLib: Install FvFspT in PeiReportFvLib Thread-Index: AQHV6SDUAoKHKU8S+EqszWr7KOqYrKgupDZw Date: Thu, 27 Feb 2020 06:58:11 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5D8FC60@ORSMSX114.amr.corp.intel.com> References: <20200222013731.16204-1-miki.shindo@intel.com> In-Reply-To: <20200222013731.16204-1-miki.shindo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmY0YTQ4N2YtOTliNC00MDdjLTgxMTEtOWNjMGFmYTY1YmY3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiaWxUaUlYS2Z6RG1DM0Z0b2NGXC9QYXlidVwvTjZPdk0xUkRBYW1tbkV5cERcL1N2dTRQeFpcL0RzdmM2UmdtTnBWQkQifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Shindo, Miki =20 Sent: Friday, February 21, 2020 5:38 PM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V ; Chiu, Chasel ; Desimone, Nathaniel L = ; Agyeman, Prince Subject: [edk2-platforms: PATCH] MinPlatformPkg/PeiReportFvLib: Install FvF= spT in PeiReportFvLib REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2410 TPM measurements in PEI runs on FV_INFO_PPI notification function. Currently FvFspT is not installed so it is not measured by TPM. This commit makes FvFspT installed by FV_INFO_PPI so the measurement would = run for FvFspT. FvFspT code actually runs, it has to be measured. Signed-off-by: Miki Shindo Cc: Sai Chaganty Cc: Chasel Chiu Cc: Nate DeSimone Cc: Prince Agyeman --- .../Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLi= b.c | 13 ++++++++++++- .../Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLi= b.inf | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFv= Lib/PeiReportFvLib.c b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/P= eiReportFvLib/PeiReportFvLib.c index 0d805d6fe7..6158fc9412 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.c +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/ +++ PeiReportFvLib.c @@ -1,7 +1,7 @@ /** @file Source code file for Report Firmware Volume (FV) library =20 -Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -31,6 +31,17 @@ ReportPreMemFv ( 0 ); } + if (PcdGetBool(PcdFspWrapperBootMode)) { + DEBUG ((DEBUG_INFO, "Install FlashFvFspT - 0x%x, 0x%x\n", PcdGet32 (Pc= dFlashFvFspTBase), PcdGet32 (PcdFlashFvFspTSize))); + PeiServicesInstallFvInfo2Ppi ( + &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFlashFvFspTBa= se))->FileSystemGuid), + (VOID *) (UINTN) PcdGet32 (PcdFlashFvFspTBase), + PcdGet32 (PcdFlashFvFspTSize), + NULL, + NULL, + 0 + ); + } DEBUG ((DEBUG_INFO, "Install FlashFvSecurity - 0x%x, 0x%x\n", PcdGet32 (= PcdFlashFvSecurityBase), PcdGet32 (PcdFlashFvSecuritySize))); PeiServicesInstallFvInfo2Ppi ( &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFlashFvSecurity= Base))->FileSystemGuid), diff --git a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFv= Lib/PeiReportFvLib.inf b/Platform/Intel/MinPlatformPkg/PlatformInit/Library= /PeiReportFvLib/PeiReportFvLib.inf index ef03e110bd..79cd5ee1f7 100644 --- a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/Pei= ReportFvLib.inf +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/ +++ PeiReportFvLib.inf @@ -1,7 +1,7 @@ ### @file # Component information file for the Report Firmware Volume (FV) library. # -# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2020, Intel Corporation. All rights=20 +reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -36,6 +36,8 @@ 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 -- 2.16.2.windows.1