SecurityPkg Tcg(2)Pei: Remove the using of PcdPeiCoreMaxFvSupported

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1405

Background as below.

Problem:
As static configuration from the PCDs, the binary PeiCore (for example
in FSP binary with dispatch mode) could not predict how many FVs,
Files or PPIs for different platforms.

Burden:
Platform developers need configure the PCDs accordingly for different
platforms.

To solve the problem and remove the burden, we can update PeiCore to
remove the using of PcdPeiCoreMaxFvSupported, PcdPeiCoreMaxPeimPerFv
and PcdPeiCoreMaxPpiSupported by extending buffer dynamically for FV,
File and PPI management.

This patch removes the using of PcdPeiCoreMaxFvSupported in Tcg(2)Pei.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>

4 files changed, 74 insertions, 46 deletions

diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
index 09ef0c70a5..152e3f737b 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.c
@@ -71,10 +71,17 @@ EFI_PEI_PPI_DESCRIPTOR  mTpmInitializationDonePpiList = {
   NULL

 };

 

+//

+// Number of firmware blobs to grow by each time we run out of room

+//

+#define FIRMWARE_BLOB_GROWTH_STEP 4

+

 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredBaseFvInfo;

+UINT32 mMeasuredMaxBaseFvIndex = 0;

 UINT32 mMeasuredBaseFvIndex = 0;

 

 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredChildFvInfo;

+UINT32 mMeasuredMaxChildFvIndex = 0;

 UINT32 mMeasuredChildFvIndex = 0;

 

 /**

@@ -615,13 +622,20 @@ MeasureFvImage (
   //

   // Add new FV into the measured FV list.

   //

-  ASSERT (mMeasuredBaseFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported));

-  if (mMeasuredBaseFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported)) {

-    mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobBase   = FvBase;

-    mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobLength = FvLength;

-    mMeasuredBaseFvIndex++;

+  if (mMeasuredBaseFvIndex >= mMeasuredMaxBaseFvIndex) {

+    mMeasuredBaseFvInfo = ReallocatePool (

+                            sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * mMeasuredMaxBaseFvIndex,

+                            sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredMaxBaseFvIndex + FIRMWARE_BLOB_GROWTH_STEP),

+                            mMeasuredBaseFvInfo

+                            );

+    ASSERT (mMeasuredBaseFvInfo != NULL);

+    mMeasuredMaxBaseFvIndex = mMeasuredMaxBaseFvIndex + FIRMWARE_BLOB_GROWTH_STEP;

   }

 

+  mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobBase   = FvBase;

+  mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobLength = FvLength;

+  mMeasuredBaseFvIndex++;

+

   return Status;

 }

 

@@ -724,20 +738,26 @@ FirmwareVolmeInfoPpiNotifyCallback (
   //

   if (Fv->ParentFvName != NULL || Fv->ParentFileName != NULL ) {

 

-    ASSERT (mMeasuredChildFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported));

-    if (mMeasuredChildFvIndex < PcdGet32 (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;

-        }

+    if (mMeasuredChildFvIndex >= mMeasuredMaxChildFvIndex) {

+      mMeasuredChildFvInfo = ReallocatePool (

+                               sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * mMeasuredMaxChildFvIndex,

+                               sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredMaxChildFvIndex + FIRMWARE_BLOB_GROWTH_STEP),

+                               mMeasuredChildFvInfo

+                               );

+      ASSERT (mMeasuredChildFvInfo != NULL);

+      mMeasuredMaxChildFvIndex = mMeasuredMaxChildFvIndex + FIRMWARE_BLOB_GROWTH_STEP;

+    }

+    //

+    // 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++;

     }

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

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

+    mMeasuredChildFvIndex++;

     return EFI_SUCCESS;

   }

 

@@ -761,11 +781,6 @@ PeimEntryMP (
 {

   EFI_STATUS                        Status;

 

-  mMeasuredBaseFvInfo  = (EFI_PLATFORM_FIRMWARE_BLOB *) AllocateZeroPool (sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * PcdGet32 (PcdPeiCoreMaxFvSupported));

-  ASSERT (mMeasuredBaseFvInfo != NULL);

-  mMeasuredChildFvInfo = (EFI_PLATFORM_FIRMWARE_BLOB *) AllocateZeroPool (sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * PcdGet32 (PcdPeiCoreMaxFvSupported));

-  ASSERT (mMeasuredChildFvInfo != NULL);

-

   if (PcdGet8 (PcdTpm2ScrtmPolicy) == 1) {

     Status = MeasureCRTMVersion ();

   }

diff --git a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
index ea9dc759ab..2f3dcb7e81 100644
--- a/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
+++ b/SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
@@ -83,7 +83,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2InitializationPolicy            ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2SelfTestPolicy                  ## SOMETIMES_CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2ScrtmPolicy                     ## CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported              ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice         ## SOMETIMES_CONSUMES

   ## SOMETIMES_CONSUMES

   ## SOMETIMES_PRODUCES

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index d07047580c..8b063c081b 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -57,10 +57,17 @@ EFI_PEI_PPI_DESCRIPTOR  mTpmInitializationDonePpiList = {
   NULL

 };

 

+//

+// Number of firmware blobs to grow by each time we run out of room

+//

+#define FIRMWARE_BLOB_GROWTH_STEP 4

+

 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredBaseFvInfo;

+UINT32 mMeasuredMaxBaseFvIndex = 0;

 UINT32 mMeasuredBaseFvIndex = 0;

 

 EFI_PLATFORM_FIRMWARE_BLOB *mMeasuredChildFvInfo;

+UINT32 mMeasuredMaxChildFvIndex = 0;

 UINT32 mMeasuredChildFvIndex = 0;

 

 EFI_PEI_FIRMWARE_VOLUME_INFO_MEASUREMENT_EXCLUDED_PPI *mMeasurementExcludedFvPpi;

@@ -424,13 +431,20 @@ MeasureFvImage (
   //

   // Add new FV into the measured FV list.

   //

-  ASSERT (mMeasuredBaseFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported));

-  if (mMeasuredBaseFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported)) {

-    mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobBase   = FvBase;

-    mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobLength = FvLength;

-    mMeasuredBaseFvIndex++;

+  if (mMeasuredBaseFvIndex >= mMeasuredMaxBaseFvIndex) {

+    mMeasuredBaseFvInfo = ReallocatePool (

+                            sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * mMeasuredMaxBaseFvIndex,

+                            sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredMaxBaseFvIndex + FIRMWARE_BLOB_GROWTH_STEP),

+                            mMeasuredBaseFvInfo

+                            );

+    ASSERT (mMeasuredBaseFvInfo != NULL);

+    mMeasuredMaxBaseFvIndex = mMeasuredMaxBaseFvIndex + FIRMWARE_BLOB_GROWTH_STEP;

   }

 

+  mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobBase   = FvBase;

+  mMeasuredBaseFvInfo[mMeasuredBaseFvIndex].BlobLength = FvLength;

+  mMeasuredBaseFvIndex++;

+

   return Status;

 }

 

@@ -537,20 +551,26 @@ FirmwareVolmeInfoPpiNotifyCallback (
   //

   if (Fv->ParentFvName != NULL || Fv->ParentFileName != NULL ) {

 

-    ASSERT (mMeasuredChildFvIndex < PcdGet32 (PcdPeiCoreMaxFvSupported));

-    if (mMeasuredChildFvIndex < PcdGet32 (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;

-        }

+    if (mMeasuredChildFvIndex >= mMeasuredMaxChildFvIndex) {

+      mMeasuredChildFvInfo = ReallocatePool (

+                               sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * mMeasuredMaxChildFvIndex,

+                               sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * (mMeasuredMaxChildFvIndex + FIRMWARE_BLOB_GROWTH_STEP),

+                               mMeasuredChildFvInfo

+                               );

+      ASSERT (mMeasuredChildFvInfo != NULL);

+      mMeasuredMaxChildFvIndex = mMeasuredMaxChildFvIndex + FIRMWARE_BLOB_GROWTH_STEP;

+    }

+    //

+    // 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++;

     }

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

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

+    mMeasuredChildFvIndex++;

     return EFI_SUCCESS;

   }

 

@@ -707,11 +727,6 @@ PeimEntryMP (
                );

   // Do not check status, because it is optional

 

-  mMeasuredBaseFvInfo  = (EFI_PLATFORM_FIRMWARE_BLOB *) AllocateZeroPool (sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * PcdGet32 (PcdPeiCoreMaxFvSupported));

-  ASSERT (mMeasuredBaseFvInfo != NULL);

-  mMeasuredChildFvInfo = (EFI_PLATFORM_FIRMWARE_BLOB *) AllocateZeroPool (sizeof (EFI_PLATFORM_FIRMWARE_BLOB) * PcdGet32 (PcdPeiCoreMaxFvSupported));

-  ASSERT (mMeasuredChildFvInfo != NULL);

-

   Status = Tpm12RequestUseTpm ();

   if (EFI_ERROR (Status)) {

     return Status;

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 4c8a055c6c..8db93b908f 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -81,7 +81,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                    ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy            ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy                     ## SOMETIMES_CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES

   gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice        ## SOMETIMES_CONSUMES

 

 [Depex]