SecuritPkg: Tcg2Smm: Add PlatformClass to TPM2 Table

[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Smm / Tcg2Smm.c

diff --git a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
index 1df2da8688f8064e779db103f6c9069823906fba..5a1fd3e363c7202375b93c0feb389d4da1686ca1 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
+++ b/SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.c
@@ -77,14 +77,14 @@ EFI_TPM2_ACPI_TABLE  mTpm2AcpiTemplate = {
   {\r
     EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE,\r
     sizeof (mTpm2AcpiTemplate),\r
-    EFI_TPM2_ACPI_TABLE_REVISION_4,\r
+    EFI_TPM2_ACPI_TABLE_REVISION,\r
     //\r
     // Compiler initializes the remaining bytes to 0\r
     // These fields should be filled in in production\r
     //\r
   },\r
-  0, // 16-bit PlatformClass\r
-  0, // 16-bit Reserved\r
+  0, // BIT0~15:  PlatformClass\r
+     // BIT16~31: Reserved\r
   0, // Control Area\r
   EFI_TPM2_ACPI_TABLE_START_METHOD_TIS, // StartMethod\r
 };\r
@@ -512,6 +512,16 @@ PublishTpm2 (
   mTpm2AcpiTemplate.Header.Revision = PcdGet8(PcdTpm2AcpiTableRev);\r
   DEBUG((DEBUG_INFO, "Tpm2 ACPI table revision is %d\n", mTpm2AcpiTemplate.Header.Revision));\r
 \r
+  //\r
+  // PlatformClass is only valid for version 4 and above\r
+  //    BIT0~15:  PlatformClass \r
+  //    BIT16~31: Reserved\r
+  //\r
+  if (mTpm2AcpiTemplate.Header.Revision >= EFI_TPM2_ACPI_TABLE_REVISION_4) {\r
+    mTpm2AcpiTemplate.Flags = (mTpm2AcpiTemplate.Flags & 0xFFFF0000) | PcdGet8(PcdTpmPlatformClass);\r
+    DEBUG((DEBUG_INFO, "Tpm2 ACPI table PlatformClass is %d\n", (mTpm2AcpiTemplate.Flags & 0x0000FFFF)));\r
+  }\r
+\r
   //\r
   // Measure to PCR[0] with event EV_POST_CODE ACPI DATA\r
   //\r