public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Yao, Jiewen" <jiewen.yao@intel.com>
To: "Zhang, Qi1" <qi1.zhang@intel.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Chiu, Chasel" <chasel.chiu@intel.com>,
	"Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>,
	"Zeng, Star" <star.zeng@intel.com>
Subject: Re: [PATCH 7/9] IntelFsp2WraperPkg/Fsp{m|s}WrapperPeim: Add FspBin measurement.
Date: Sun, 2 Aug 2020 08:46:30 +0000	[thread overview]
Message-ID: <CY4PR11MB12885475CC193D4E740E3FB88C4C0@CY4PR11MB1288.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200731085437.16070-8-qi1.zhang@intel.com>

Please remove FSP_MEASURE_FSPUPD check here.
It should be checked in FspMeasurementLib.

Thank you
Yao Jiewen

> -----Original Message-----
> From: Zhang, Qi1 <qi1.zhang@intel.com>
> Sent: Friday, July 31, 2020 4:55 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star
> <star.zeng@intel.com>; Zhang, Qi1 <qi1.zhang@intel.com>
> Subject: [PATCH 7/9] IntelFsp2WraperPkg/Fsp{m|s}WrapperPeim: Add FspBin
> measurement.
> 
> From: Jiewen Yao <jiewen.yao@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2376
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Qi Zhang <qi1.zhang@intel.com>
> Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
> ---
>  .../FspmWrapperPeim/FspmWrapperPeim.c         | 115 +++++++++++++++++-
>  .../FspmWrapperPeim/FspmWrapperPeim.inf       |  20 ++-
>  .../FspsWrapperPeim/FspsWrapperPeim.c         |  96 ++++++++++++++-
>  .../FspsWrapperPeim/FspsWrapperPeim.inf       |  27 ++--
>  4 files changed, 239 insertions(+), 19 deletions(-)
> 
> diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
> b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
> index 265b77ed60..1533971d7f 100644
> --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
> +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
> @@ -3,7 +3,7 @@
>    register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> 
>    notify to call FspSiliconInit API.
> 
> 
> 
> -  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
> 
> +  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
>  **/
> 
> @@ -25,11 +25,14 @@
>  #include <Library/FspWrapperPlatformLib.h>
> 
>  #include <Library/FspWrapperHobProcessLib.h>
> 
>  #include <Library/FspWrapperApiLib.h>
> 
> +#include <Library/FspMeasurementLib.h>
> 
> 
> 
>  #include <Ppi/FspSiliconInitDone.h>
> 
>  #include <Ppi/EndOfPeiPhase.h>
> 
>  #include <Ppi/MemoryDiscovered.h>
> 
>  #include <Ppi/SecPlatformInformation.h>
> 
> +#include <Ppi/Tcg.h>
> 
> +#include <Ppi/FirmwareVolumeInfoMeasurementExcluded.h>
> 
>  #include <Library/FspWrapperApiTestLib.h>
> 
>  #include <FspEas.h>
> 
>  #include <FspStatusCode.h>
> 
> @@ -147,7 +150,21 @@ FspmWrapperInit (
>    VOID
> 
>    )
> 
>  {
> 
> -  EFI_STATUS           Status;
> 
> +  EFI_STATUS                                            Status;
> 
> +  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI
> *MeasurementExcludedFvPpi;
> 
> +  EFI_PEI_PPI_DESCRIPTOR                                *MeasurementExcludedPpiList;
> 
> +
> 
> +  MeasurementExcludedFvPpi = AllocatePool
> (sizeof(*MeasurementExcludedFvPpi));
> 
> +  ASSERT(MeasurementExcludedFvPpi != NULL);
> 
> +  MeasurementExcludedFvPpi->Count = 1;
> 
> +  MeasurementExcludedFvPpi->Fv[0].FvBase = PcdGet32 (PcdFspmBaseAddress);
> 
> +  MeasurementExcludedFvPpi->Fv[0].FvLength =
> ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
> (PcdFspmBaseAddress))->FvLength;
> 
> +
> 
> +  MeasurementExcludedPpiList = AllocatePool
> (sizeof(*MeasurementExcludedPpiList));
> 
> +  ASSERT(MeasurementExcludedPpiList != NULL);
> 
> +  MeasurementExcludedPpiList->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI |
> EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
> 
> +  MeasurementExcludedPpiList->Guid  =
> &gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid;
> 
> +  MeasurementExcludedPpiList->Ppi   = MeasurementExcludedFvPpi;
> 
> 
> 
>    Status = EFI_SUCCESS;
> 
> 
> 
> @@ -155,6 +172,9 @@ FspmWrapperInit (
>      Status = PeiFspMemoryInit ();
> 
>      ASSERT_EFI_ERROR (Status);
> 
>    } else {
> 
> +    Status = PeiServicesInstallPpi (MeasurementExcludedPpiList);
> 
> +    ASSERT_EFI_ERROR (Status);
> 
> +
> 
>      PeiServicesInstallFvInfoPpi (
> 
>        NULL,
> 
>        (VOID *)(UINTN) PcdGet32 (PcdFspmBaseAddress),
> 
> @@ -167,6 +187,92 @@ FspmWrapperInit (
>    return Status;
> 
>  }
> 
> 
> 
> +/**
> 
> +  This function is called after TCG installed PPI.
> 
> +
> 
> +  @param[in] PeiServices    Pointer to PEI Services Table.
> 
> +  @param[in] NotifyDesc     Pointer to the descriptor for the Notification event
> that
> 
> +                            caused this function to execute.
> 
> +  @param[in] Ppi            Pointer to the PPI data associated with this function.
> 
> +
> 
> +  @retval EFI_STATUS        Always return EFI_SUCCESS
> 
> +**/
> 
> +EFI_STATUS
> 
> +EFIAPI
> 
> +TcgPpiNotify (
> 
> +  IN EFI_PEI_SERVICES          **PeiServices,
> 
> +  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
> 
> +  IN VOID                      *Ppi
> 
> +  );
> 
> +
> 
> +EFI_PEI_NOTIFY_DESCRIPTOR mTcgPpiNotifyDesc = {
> 
> +  (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK |
> EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
> 
> +  &gEdkiiTcgPpiGuid,
> 
> +  TcgPpiNotify
> 
> +};
> 
> +
> 
> +/**
> 
> +  This function is called after TCG installed PPI.
> 
> +
> 
> +  @param[in] PeiServices    Pointer to PEI Services Table.
> 
> +  @param[in] NotifyDesc     Pointer to the descriptor for the Notification event
> that
> 
> +                            caused this function to execute.
> 
> +  @param[in] Ppi            Pointer to the PPI data associated with this function.
> 
> +
> 
> +  @retval EFI_STATUS        Always return EFI_SUCCESS
> 
> +**/
> 
> +EFI_STATUS
> 
> +EFIAPI
> 
> +TcgPpiNotify (
> 
> +  IN EFI_PEI_SERVICES          **PeiServices,
> 
> +  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
> 
> +  IN VOID                      *Ppi
> 
> +  )
> 
> +{
> 
> +  UINT32                    FspMeasureMask;
> 
> +  FSP_INFO_HEADER           *FspHeaderPtr;
> 
> +
> 
> +  DEBUG ((DEBUG_INFO, "TcgPpiNotify FSPM\n"));
> 
> +
> 
> +  FspMeasureMask = PcdGet32 (PcdFspMeasurementConfig);
> 
> +  if (FspMeasureMask & FSP_MEASURE_FSP) {
> 
> +    if (FspMeasureMask & FSP_MEASURE_FSPT) {
> 
> +      if(FspMeasureMask & FSP_MEASURE_FSPUPD) {
> 
> +        FspHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (PcdGet32
> (PcdFsptBaseAddress));
> 
> +        if (FspHeaderPtr == NULL) {
> 
> +          return EFI_DEVICE_ERROR;
> 
> +        }
> 
> +        DEBUG ((DEBUG_INFO, "FSPT: CfgRegionOffset 0x%x, CfgRegionSize
> 0x%x\n", FspHeaderPtr->CfgRegionOffset, FspHeaderPtr->CfgRegionSize));
> 
> +        DEBUG ((DEBUG_INFO, "FSPT: PcdFsptBaseAddress 0x%x, ImageBase
> 0x%x\n", PcdGet32(PcdFsptBaseAddress), FspHeaderPtr->ImageBase));
> 
> +        MeasureFspFirmwareBlobWithCfg ("FSPT", PcdGet32(PcdFsptBaseAddress),
> 
> +                                       (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFsptBaseAddress))->FvLength,
> 
> +                                       FspHeaderPtr->CfgRegionOffset, FspHeaderPtr-
> >CfgRegionSize);
> 
> +      } else {
> 
> +        DEBUG ((DEBUG_ERROR, "\n QIZ: Measure FSPT\n"));
> 
> +        MeasureFspFirmwareBlob (0, "FSPT", PcdGet32(PcdFsptBaseAddress),
> 
> +                                (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFsptBaseAddress))->FvLength);
> 
> +      }
> 
> +    }
> 
> +    if (FspMeasureMask & FSP_MEASURE_FSPM) {
> 
> +      if(FspMeasureMask & FSP_MEASURE_FSPUPD) {
> 
> +        FspHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (PcdGet32
> (PcdFspmBaseAddress));
> 
> +        if (FspHeaderPtr == NULL) {
> 
> +          return EFI_DEVICE_ERROR;
> 
> +        }
> 
> +        MeasureFspFirmwareBlobWithCfg ("FSPM",
> PcdGet32(PcdFspmBaseAddress),
> 
> +                                       (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFspmBaseAddress))->FvLength,
> 
> +                                       FspHeaderPtr->CfgRegionOffset, FspHeaderPtr-
> >CfgRegionSize);
> 
> +      }
> 
> +      else {
> 
> +        MeasureFspFirmwareBlob (0, "FSPM", PcdGet32(PcdFspmBaseAddress),
> 
> +                                (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFspmBaseAddress))->FvLength);
> 
> +      }
> 
> +    }
> 
> +  }
> 
> +
> 
> +  return EFI_SUCCESS;
> 
> +}
> 
> +
> 
>  /**
> 
>    This is the entrypoint of PEIM
> 
> 
> 
> @@ -182,8 +288,13 @@ FspmWrapperPeimEntryPoint (
>    IN CONST EFI_PEI_SERVICES     **PeiServices
> 
>    )
> 
>  {
> 
> +  EFI_STATUS  Status;
> 
> +
> 
>    DEBUG((DEBUG_INFO, "FspmWrapperPeimEntryPoint\n"));
> 
> 
> 
> +  Status = PeiServicesNotifyPpi (&mTcgPpiNotifyDesc);
> 
> +  ASSERT_EFI_ERROR (Status);
> 
> +
> 
>    FspmWrapperInit ();
> 
> 
> 
>    return EFI_SUCCESS;
> 
> diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> index dce7ef3d0b..c3578397b6 100644
> --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
> @@ -6,7 +6,7 @@
>  # register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> 
>  # notify to call FspSiliconInit API.
> 
>  #
> 
> -#  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>  #
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
> @@ -44,17 +44,22 @@
>    TimerLib
> 
>    FspWrapperApiLib
> 
>    FspWrapperApiTestLib
> 
> +  FspMeasurementLib
> 
> 
> 
>  [Packages]
> 
>    MdePkg/MdePkg.dec
> 
> +  MdeModulePkg/MdeModulePkg.dec
> 
>    UefiCpuPkg/UefiCpuPkg.dec
> 
> +  SecurityPkg/SecurityPkg.dec
> 
>    IntelFsp2Pkg/IntelFsp2Pkg.dec
> 
>    IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> 
> 
> 
>  [Pcd]
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress     ## CONSUMES
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress  ## CONSUMES
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection    ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress       ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress    ##
> CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection      ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress       ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig  ##
> CONSUMES
> 
> 
> 
>  [Sources]
> 
>    FspmWrapperPeim.c
> 
> @@ -63,5 +68,10 @@
>    gFspHobGuid                           ## PRODUCES ## HOB
> 
>    gFspApiPerformanceGuid                ## SOMETIMES_CONSUMES ## GUID
> 
> 
> 
> +[Ppis]
> 
> +  gEdkiiTcgPpiGuid                                       ## NOTIFY
> 
> +  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid    ## PRODUCES
> 
> +
> 
>  [Depex]
> 
> -  gEfiPeiMasterBootModePpiGuid
> 
> +  gEfiPeiMasterBootModePpiGuid AND
> 
> +  gPeiTpmInitializationDonePpiGuid
> 
> diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c
> b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c
> index b20f0805a0..688c82a6c8 100644
> --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c
> +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c
> @@ -3,7 +3,7 @@
>    register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> 
>    notify to call FspSiliconInit API.
> 
> 
> 
> -  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
>  **/
> 
> @@ -24,12 +24,15 @@
>  #include <Library/TimerLib.h>
> 
>  #include <Library/PerformanceLib.h>
> 
>  #include <Library/FspWrapperApiLib.h>
> 
> +#include <Library/FspMeasurementLib.h>
> 
> 
> 
>  #include <Ppi/FspSiliconInitDone.h>
> 
>  #include <Ppi/EndOfPeiPhase.h>
> 
>  #include <Ppi/MemoryDiscovered.h>
> 
>  #include <Ppi/TemporaryRamDone.h>
> 
>  #include <Ppi/SecPlatformInformation.h>
> 
> +#include <Ppi/Tcg.h>
> 
> +#include <Ppi/FirmwareVolumeInfoMeasurementExcluded.h>
> 
>  #include <Library/FspWrapperApiTestLib.h>
> 
>  #include <FspEas.h>
> 
>  #include <FspStatusCode.h>
> 
> @@ -379,7 +382,25 @@ FspsWrapperInitDispatchMode (
>    VOID
> 
>    )
> 
>  {
> 
> -  EFI_STATUS           Status;
> 
> +  EFI_STATUS                                            Status;
> 
> +  EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI
> *MeasurementExcludedFvPpi;
> 
> +  EFI_PEI_PPI_DESCRIPTOR                                *MeasurementExcludedPpiList;
> 
> +
> 
> +  MeasurementExcludedFvPpi = AllocatePool
> (sizeof(*MeasurementExcludedFvPpi));
> 
> +  ASSERT(MeasurementExcludedFvPpi != NULL);
> 
> +  MeasurementExcludedFvPpi->Count = 1;
> 
> +  MeasurementExcludedFvPpi->Fv[0].FvBase = PcdGet32 (PcdFspsBaseAddress);
> 
> +  MeasurementExcludedFvPpi->Fv[0].FvLength =
> ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32
> (PcdFspsBaseAddress))->FvLength;
> 
> +
> 
> +  MeasurementExcludedPpiList = AllocatePool
> (sizeof(*MeasurementExcludedPpiList));
> 
> +  ASSERT(MeasurementExcludedPpiList != NULL);
> 
> +  MeasurementExcludedPpiList->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI |
> EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
> 
> +  MeasurementExcludedPpiList->Guid  =
> &gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid;
> 
> +  MeasurementExcludedPpiList->Ppi   = MeasurementExcludedFvPpi;
> 
> +
> 
> +  Status = PeiServicesInstallPpi (MeasurementExcludedPpiList);
> 
> +  ASSERT_EFI_ERROR (Status);
> 
> +
> 
>    //
> 
>    // FSP-S Wrapper running in Dispatch mode and reports FSP-S FV to PEI
> dispatcher.
> 
>    //
> 
> @@ -398,6 +419,72 @@ FspsWrapperInitDispatchMode (
>    return Status;
> 
>  }
> 
> 
> 
> +/**
> 
> +  This function is called after TCG installed PPI.
> 
> +
> 
> +  @param[in] PeiServices    Pointer to PEI Services Table.
> 
> +  @param[in] NotifyDesc     Pointer to the descriptor for the Notification event
> that
> 
> +                            caused this function to execute.
> 
> +  @param[in] Ppi            Pointer to the PPI data associated with this function.
> 
> +
> 
> +  @retval EFI_STATUS        Always return EFI_SUCCESS
> 
> +**/
> 
> +EFI_STATUS
> 
> +EFIAPI
> 
> +TcgPpiNotify (
> 
> +  IN EFI_PEI_SERVICES          **PeiServices,
> 
> +  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
> 
> +  IN VOID                      *Ppi
> 
> +  );
> 
> +
> 
> +EFI_PEI_NOTIFY_DESCRIPTOR mTcgPpiNotifyDesc = {
> 
> +  (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK |
> EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
> 
> +  &gEdkiiTcgPpiGuid,
> 
> +  TcgPpiNotify
> 
> +};
> 
> +
> 
> +/**
> 
> +  This function is called after TCG installed PPI.
> 
> +
> 
> +  @param[in] PeiServices    Pointer to PEI Services Table.
> 
> +  @param[in] NotifyDesc     Pointer to the descriptor for the Notification event
> that
> 
> +                            caused this function to execute.
> 
> +  @param[in] Ppi            Pointer to the PPI data associated with this function.
> 
> +
> 
> +  @retval EFI_STATUS        Always return EFI_SUCCESS
> 
> +**/
> 
> +EFI_STATUS
> 
> +EFIAPI
> 
> +TcgPpiNotify (
> 
> +  IN EFI_PEI_SERVICES          **PeiServices,
> 
> +  IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDesc,
> 
> +  IN VOID                      *Ppi
> 
> +  )
> 
> +{
> 
> +  UINT32                    FspMeasureMask;
> 
> +  FSP_INFO_HEADER           *FspHeaderPtr;
> 
> +
> 
> +  DEBUG ((DEBUG_INFO, "TcgPpiNotify FSPS\n"));
> 
> +
> 
> +  FspMeasureMask = PcdGet32 (PcdFspMeasurementConfig);
> 
> +  if ((FspMeasureMask & FSP_MEASURE_FSP) && (FspMeasureMask &
> FSP_MEASURE_FSPS)) {
> 
> +    if(FspMeasureMask & FSP_MEASURE_FSPUPD) {
> 
> +      FspHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (PcdGet32
> (PcdFspsBaseAddress));
> 
> +      if (FspHeaderPtr == NULL) {
> 
> +        return EFI_DEVICE_ERROR;
> 
> +      }
> 
> +      MeasureFspFirmwareBlobWithCfg ("FSPS", PcdGet32(PcdFspsBaseAddress),
> 
> +                                     (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFspsBaseAddress))->FvLength,
> 
> +                                     FspHeaderPtr->CfgRegionOffset, FspHeaderPtr-
> >CfgRegionSize);
> 
> +    } else {
> 
> +      MeasureFspFirmwareBlob (0, "FSPS", PcdGet32(PcdFspsBaseAddress),
> 
> +                              (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN)
> PcdGet32 (PcdFspsBaseAddress))->FvLength);
> 
> +    }
> 
> +  }
> 
> +
> 
> +  return EFI_SUCCESS;
> 
> +}
> 
> +
> 
>  /**
> 
>    This is the entrypoint of PEIM.
> 
> 
> 
> @@ -413,8 +500,13 @@ FspsWrapperPeimEntryPoint (
>    IN CONST EFI_PEI_SERVICES     **PeiServices
> 
>    )
> 
>  {
> 
> +  EFI_STATUS  Status;
> 
> +
> 
>    DEBUG ((DEBUG_INFO, "FspsWrapperPeimEntryPoint\n"));
> 
> 
> 
> +  Status = PeiServicesNotifyPpi (&mTcgPpiNotifyDesc);
> 
> +  ASSERT_EFI_ERROR (Status);
> 
> +
> 
>    if (PcdGet8 (PcdFspModeSelection) == 1) {
> 
>      FspsWrapperInitApiMode ();
> 
>    } else {
> 
> diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> index 7da92991c8..884514747f 100644
> --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf
> @@ -6,7 +6,7 @@
>  # register TemporaryRamDonePpi to call TempRamExit API, and register
> MemoryDiscoveredPpi
> 
>  # notify to call FspSiliconInit API.
> 
>  #
> 
> -#  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +#  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>  #
> 
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #
> 
> @@ -44,24 +44,30 @@
>    PerformanceLib
> 
>    FspWrapperApiLib
> 
>    FspWrapperApiTestLib
> 
> +  FspMeasurementLib
> 
> 
> 
>  [Packages]
> 
>    MdePkg/MdePkg.dec
> 
> +  MdeModulePkg/MdeModulePkg.dec
> 
>    UefiCpuPkg/UefiCpuPkg.dec
> 
> +  SecurityPkg/SecurityPkg.dec
> 
>    IntelFsp2Pkg/IntelFsp2Pkg.dec
> 
>    IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
> 
> 
> 
>  [Ppis]
> 
> -  gTopOfTemporaryRamPpiGuid             ## PRODUCES
> 
> -  gFspSiliconInitDonePpiGuid            ## PRODUCES
> 
> -  gEfiEndOfPeiSignalPpiGuid             ## PRODUCES
> 
> -  gEfiTemporaryRamDonePpiGuid           ## PRODUCES
> 
> -  gEfiPeiMemoryDiscoveredPpiGuid        ## NOTIFY
> 
> +  gTopOfTemporaryRamPpiGuid                              ## PRODUCES
> 
> +  gFspSiliconInitDonePpiGuid                             ## PRODUCES
> 
> +  gEfiEndOfPeiSignalPpiGuid                              ## PRODUCES
> 
> +  gEfiTemporaryRamDonePpiGuid                            ## PRODUCES
> 
> +  gEfiPeiMemoryDiscoveredPpiGuid                         ## NOTIFY
> 
> +  gEdkiiTcgPpiGuid                                       ## NOTIFY
> 
> +  gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid    ## PRODUCES
> 
> 
> 
>  [Pcd]
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress     ## CONSUMES
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress  ## CONSUMES
> 
> -  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection    ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress       ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress    ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection      ## CONSUMES
> 
> +  gIntelFsp2WrapperTokenSpaceGuid.PcdFspMeasurementConfig  ##
> CONSUMES
> 
> 
> 
>  [Guids]
> 
>    gFspHobGuid                           ## CONSUMES ## HOB
> 
> @@ -71,4 +77,5 @@
>    FspsWrapperPeim.c
> 
> 
> 
>  [Depex]
> 
> -  gEfiPeiMemoryDiscoveredPpiGuid
> 
> +  gEfiPeiMemoryDiscoveredPpiGuid AND
> 
> +  gPeiTpmInitializationDonePpiGuid
> 
> --
> 2.26.2.windows.1


  reply	other threads:[~2020-08-02  8:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31  8:54 [PATCH 0/9] Need add a FSP binary measurement Qi Zhang
2020-07-31  8:54 ` [PATCH 1/9] MdeModulePkg/TpmMeasurementLib: Add new API to TpmMeasurmentLib Qi Zhang
2020-08-02  8:36   ` Yao, Jiewen
2020-07-31  8:54 ` [PATCH 2/9] MdeModulePkg/NullTpmMeasurementLib: Add new API Qi Zhang
2020-07-31  8:54 ` [PATCH 3/9] SecurityPkg/DxeTpmMeasurementLib: " Qi Zhang
2020-07-31  8:54 ` [PATCH 4/9] SecurityPkg/PeiTpmMeasurementLib: " Qi Zhang
2020-08-02  8:43   ` Yao, Jiewen
2020-07-31  8:54 ` [PATCH 5/9] IntelFsp2WrapperPkg/FspMeasurementLib: Add header file Qi Zhang
2020-08-02  8:39   ` Yao, Jiewen
2020-07-31  8:54 ` [PATCH 6/9] IntelFsp2WrapperPkg/FspMeasurementLib: Add BaseFspMeasurementLib Qi Zhang
2020-08-02  8:45   ` Yao, Jiewen
2020-07-31  8:54 ` [PATCH 7/9] IntelFsp2WraperPkg/Fsp{m|s}WrapperPeim: Add FspBin measurement Qi Zhang
2020-08-02  8:46   ` Yao, Jiewen [this message]
2020-07-31  8:54 ` [PATCH 8/9] IntelFsp2Wrapper/dsc: Add FspTpmMeasurementLib and PcdFspMeasurementConfig Qi Zhang
2020-07-31  8:54 ` [PATCH 9/9] SecurityPkg/HashLib: add API HashFinal Qi Zhang
2020-08-02  8:48   ` Yao, Jiewen

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=CY4PR11MB12885475CC193D4E740E3FB88C4C0@CY4PR11MB1288.namprd11.prod.outlook.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