Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Shindo, Miki <miki.shi...@intel.com> > Sent: Saturday, February 22, 2020 9:38 AM > To: devel@edk2.groups.io > Cc: Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; Chiu, Chasel > <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Agyeman, Prince > <prince.agye...@intel.com> > Subject: [edk2-platforms: PATCH] MinPlatformPkg/PeiReportFvLib: Install > FvFspT in PeiReportFvLib > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2410 > > 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 <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> > --- > .../Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib > .c | 13 ++++++++++++- > .../Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiReportFvLib > .inf | 4 +++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.c > b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.c > index 0d805d6fe7..6158fc9412 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.c > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/ > +++ PeiReportFvLib.c > @@ -1,7 +1,7 @@ > /** @file > Source code file for Report Firmware Volume (FV) library > > -Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -31,6 +31,17 @@ ReportPreMemFv ( > 0 > ); > } > + if (PcdGetBool(PcdFspWrapperBootMode)) { > + DEBUG ((DEBUG_INFO, "Install FlashFvFspT - 0x%x, 0x%x\n", PcdGet32 > (PcdFlashFvFspTBase), PcdGet32 (PcdFlashFvFspTSize))); > + PeiServicesInstallFvInfo2Ppi ( > + &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 > (PcdFlashFvFspTBase))->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 > (PcdFlashFvSecurityBase))->FileSystemGuid), > diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.inf > b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.inf > index ef03e110bd..79cd5ee1f7 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRep > ortFvLib.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.<BR> > +# Copyright (c) 2018 - 2020, Intel Corporation. All rights > +reserved.<BR> > # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -36,6 +36,8 @@ > gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMBase > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize > ## CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase > ## CONSUMES > + gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSBase > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUBase > ## CONSUMES > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54765): https://edk2.groups.io/g/devel/message/54765 Mute This Topic: https://groups.io/mt/71508030/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-