From f653958984cdfb1ba0cf37920e571b2833ffb5e0 Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Mon, 31 Dec 2012 00:05:52 +0000
Subject: [PATCH] --- yaml --- r: 350879 b: refs/heads/master c:
 99c93f55a5eeccdc902da0396a8f9b4ec8a55c63 h: refs/heads/master i:   350877:
 9fdfda19c64765c3a73be826655a26e833901927   350875:
 c5f5e3fb1d5b870985979ddb1d739eae6f354d86   350871:
 14d347ff00f07059674907117198c597a90900e5   350863:
 1c54cd9c42173bd55e5aa91e66e401ab7b9d7fa8   350847:
 21bf59e79be77a698fa3262de647afe8509b7e96 v: v3

---
 [refs]                      |  2 +-
 trunk/include/acpi/actbl3.h | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 92c41e590e92..b9494ccc3c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c41679a4481d5bf9908d99644d47b2e8ff6f028f
+refs/heads/master: 99c93f55a5eeccdc902da0396a8f9b4ec8a55c63
diff --git a/trunk/include/acpi/actbl3.h b/trunk/include/acpi/actbl3.h
index 6585141e4b97..a067d7d0df7d 100644
--- a/trunk/include/acpi/actbl3.h
+++ b/trunk/include/acpi/actbl3.h
@@ -68,6 +68,7 @@
 #define ACPI_SIG_PCCT           "PCCT"	/* Platform Communications Channel Table */
 #define ACPI_SIG_PMTT           "PMTT"	/* Platform Memory Topology Table */
 #define ACPI_SIG_RASF           "RASF"	/* RAS Feature table */
+#define ACPI_SIG_TPM2           "TPM2"	/* Trusted Platform Module 2.0 H/W interface table */
 
 #define ACPI_SIG_S3PT           "S3PT"	/* S3 Performance (sub)Table */
 #define ACPI_SIG_PCCS           "PCC"	/* PCC Shared Memory Region */
@@ -550,6 +551,36 @@ enum acpi_rasf_status {
 #define ACPI_RASF_ERROR                 (1<<2)
 #define ACPI_RASF_STATUS                (0x1F<<3)
 
+/*******************************************************************************
+ *
+ * TPM2 - Trusted Platform Module (TPM) 2.0 Hardware Interface Table
+ *        Version 3
+ *
+ * Conforms to "TPM 2.0 Hardware Interface Table (TPM2)" 29 November 2011
+ *
+ ******************************************************************************/
+
+struct acpi_table_tpm2 {
+	struct acpi_table_header header;	/* Common ACPI table header */
+	u32 flags;
+	u64 control_address;
+	u32 start_method;
+};
+
+/* Control area structure (not part of table, pointed to by control_address) */
+
+struct acpi_tpm2_control {
+	u32 reserved;
+	u32 error;
+	u32 cancel;
+	u32 start;
+	u64 interrupt_control;
+	u32 command_size;
+	u64 command_address;
+	u32 response_size;
+	u64 response_address;
+};
+
 /* Reset to default packing */
 
 #pragma pack()