From: Zhang, Chao B <chao.b.zhang@intel.com>
Date: Wed, 11 Jan 2017 08:07:08 +0000 (+0800)
Subject: MdePkg: Tpm2Acpi.h: Fix incompatible change
X-Git-Tag: edk2-stable201903~4791
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=50f670acf9bb2efcf778ce71e9a3d2250ac0bb99

MdePkg: Tpm2Acpi.h: Fix incompatible change

Fix incompatible change.  Some modules are still referencing old definition.

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

diff --git a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
index 7578676e44..6b8161e6a6 100644
--- a/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
+++ b/MdePkg/Include/IndustryStandard/Tpm2Acpi.h
@@ -21,11 +21,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #define EFI_TPM2_ACPI_TABLE_REVISION_3  3
 #define EFI_TPM2_ACPI_TABLE_REVISION_4  4
+#define EFI_TPM2_ACPI_TABLE_REVISION    EFI_TPM2_ACPI_TABLE_REVISION_4
 
 typedef struct {
   EFI_ACPI_DESCRIPTION_HEADER Header;
-  UINT16                      PlatformClass;
-  UINT16                      Reserved;
+  // Flags field is replaced in version 4 and above
+  //    BIT0~15:  PlatformClass      This field is only valid for version 4 and above
+  //    BIT16~31: Reserved
+  UINT32                      Flags;
   UINT64                      AddressOfControlArea;
   UINT32                      StartMethod;
 //UINT8                       PlatformSpecificParameters[];