MdeModulePkg/SecurityPkg: Update TreePei to handle FvInfo2 and update FwVol of PeiCore to always install both FvInfo and FvInfo2.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15467 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 25 insertions, 0 deletions

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index f3f4b3f4c0..f2650a20f3 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -461,6 +461,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
   EFI_PEI_FIRMWARE_VOLUME_INFO_PPI  *Fv;

   EFI_STATUS                        Status;

   EFI_PEI_FIRMWARE_VOLUME_PPI       *FvPpi;

+  UINTN                             Index;

 

   Fv = (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *) Ppi;

 

@@ -485,6 +486,14 @@ FirmwareVolmeInfoPpiNotifyCallback (
     

     ASSERT (mMeasuredChildFvIndex < FixedPcdGet32 (PcdPeiCoreMaxFvSupported));

     if (mMeasuredChildFvIndex < FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {

+      //

+      // Check whether FV is in the measured child FV list.

+      //

+      for (Index = 0; Index < mMeasuredChildFvIndex; Index++) {

+        if (mMeasuredChildFvInfo[Index].BlobBase == (EFI_PHYSICAL_ADDRESS) (UINTN) Fv->FvInfo) {

+          return EFI_SUCCESS;

+        }

+      }

       mMeasuredChildFvInfo[mMeasuredChildFvIndex].BlobBase   = (EFI_PHYSICAL_ADDRESS) (UINTN) Fv->FvInfo;

       mMeasuredChildFvInfo[mMeasuredChildFvIndex].BlobLength = Fv->FvInfoSize;

       mMeasuredChildFvIndex++;

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
index 5dfbd8d893..001a45b310 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.c
@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include <IndustryStandard/UefiTcgPlatform.h>

 #include <Ppi/FirmwareVolumeInfo.h>

+#include <Ppi/FirmwareVolumeInfo2.h>

 #include <Ppi/LockPhysicalPresence.h>

 #include <Ppi/TpmInitialized.h>

 #include <Ppi/FirmwareVolume.h>

@@ -113,6 +114,11 @@ EFI_PEI_NOTIFY_DESCRIPTOR           mNotifyList[] = {
     FirmwareVolmeInfoPpiNotifyCallback 

   },

   {

+    EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,

+    &gEfiPeiFirmwareVolumeInfo2PpiGuid,

+    FirmwareVolmeInfoPpiNotifyCallback 

+  },

+  {

     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

     &gEfiEndOfPeiSignalPpiGuid,

     EndofPeiSignalNotifyCallBack

@@ -518,6 +524,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
   EFI_PEI_FIRMWARE_VOLUME_INFO_PPI  *Fv;

   EFI_STATUS                        Status;

   EFI_PEI_FIRMWARE_VOLUME_PPI       *FvPpi;

+  UINTN                             Index;

 

   Fv = (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *) Ppi;

 

@@ -542,6 +549,14 @@ FirmwareVolmeInfoPpiNotifyCallback (
     

     ASSERT (mMeasuredChildFvIndex < FixedPcdGet32 (PcdPeiCoreMaxFvSupported));

     if (mMeasuredChildFvIndex < FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {

+      //

+      // Check whether FV is in the measured child FV list.

+      //

+      for (Index = 0; Index < mMeasuredChildFvIndex; Index++) {

+        if (mMeasuredChildFvInfo[Index].BlobBase == (EFI_PHYSICAL_ADDRESS) (UINTN) Fv->FvInfo) {

+          return EFI_SUCCESS;

+        }

+      }

       mMeasuredChildFvInfo[mMeasuredChildFvIndex].BlobBase   = (EFI_PHYSICAL_ADDRESS) (UINTN) Fv->FvInfo;

       mMeasuredChildFvInfo[mMeasuredChildFvIndex].BlobLength = Fv->FvInfoSize;

       mMeasuredChildFvIndex++;

diff --git a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
index 719f2b4a64..f5fb3d1acb 100644
--- a/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
+++ b/SecurityPkg/Tcg/TrEEPei/TrEEPei.inf
@@ -53,6 +53,7 @@
 

 [Ppis]

   gEfiPeiFirmwareVolumeInfoPpiGuid

+  gEfiPeiFirmwareVolumeInfo2PpiGuid

   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid

   gPeiTpmInitializedPpiGuid

   gEfiEndOfPeiSignalPpiGuid