[PATCH 01/14] SecurityPkg/Tcg2Dxe: Add PcdTcgPfpMeasurementRevision in SpecId event.

[PATCH 01/14] SecurityPkg/Tcg2Dxe: Add PcdTcgPfpMeasurementRevision in SpecId event.

[Yao, Jiewen]

From: Jiewen Yao <jiewen.yao@intel.com>

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

Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
---
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c   | 2 +-
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 9a5f987e68..6d17616c1c 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1589,7 +1589,7 @@ SetupEventLog (
         TcgEfiSpecIdEventStruct->platformClass = PcdGet8 (PcdTpmPlatformClass);
         TcgEfiSpecIdEventStruct->specVersionMajor = TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM2;
         TcgEfiSpecIdEventStruct->specVersionMinor = TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM2;
-        TcgEfiSpecIdEventStruct->specErrata = TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2;
+        TcgEfiSpecIdEventStruct->specErrata = (UINT8)PcdGet32(PcdTcgPfpMeasurementRevision);
         TcgEfiSpecIdEventStruct->uintnSize = sizeof(UINTN)/sizeof(UINT32);
         NumberOfAlgorithms = 0;
         DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
index 576cf80d06..7dc7a2683d 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
@@ -106,6 +106,7 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev                         ## CONSUMES
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml                        ## PRODUCES
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa                        ## PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision               ## CONSUMES
 
 [Depex]
   # According to PcdTpm2AcpiTableRev definition in SecurityPkg.dec
-- 
2.26.2.windows.1

Re: [PATCH 01/14] SecurityPkg/Tcg2Dxe: Add PcdTcgPfpMeasurementRevision in SpecId event.

[Wang, Jian J]

Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

Regards,
Jian

> -----Original Message-----
> From: Yao, Jiewen <jiewen.yao@intel.com>
> Sent: Monday, July 06, 2020 11:03 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>
> Subject: [PATCH 01/14] SecurityPkg/Tcg2Dxe: Add
> PcdTcgPfpMeasurementRevision in SpecId event.
> 
> From: Jiewen Yao <jiewen.yao@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2839
> 
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
> ---
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c   | 2 +-
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index 9a5f987e68..6d17616c1c 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -1589,7 +1589,7 @@ SetupEventLog (
>          TcgEfiSpecIdEventStruct->platformClass = PcdGet8 (PcdTpmPlatformClass);
> 
>          TcgEfiSpecIdEventStruct->specVersionMajor =
> TCG_EfiSpecIDEventStruct_SPEC_VERSION_MAJOR_TPM2;
> 
>          TcgEfiSpecIdEventStruct->specVersionMinor =
> TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM2;
> 
> -        TcgEfiSpecIdEventStruct->specErrata =
> TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2;
> 
> +        TcgEfiSpecIdEventStruct->specErrata =
> (UINT8)PcdGet32(PcdTcgPfpMeasurementRevision);
> 
>          TcgEfiSpecIdEventStruct->uintnSize = sizeof(UINTN)/sizeof(UINT32);
> 
>          NumberOfAlgorithms = 0;
> 
>          DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8
> *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) +
> sizeof(NumberOfAlgorithms));
> 
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> index 576cf80d06..7dc7a2683d 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> @@ -106,6 +106,7 @@
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev                         ##
> CONSUMES
> 
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLaml                        ##
> PRODUCES
> 
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableLasa                        ##
> PRODUCES
> 
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision
> ## CONSUMES
> 
> 
> 
>  [Depex]
> 
>    # According to PcdTpm2AcpiTableRev definition in SecurityPkg.dec
> 
> --
> 2.26.2.windows.1