tpm: add TSS constants and structures for TPM2

The latest TPM specification uses different command codes, command
structures and return codes.

Let's put definitions for different TPM versions into different
include files.

CQ-DEPEND=CL:357831
BRANCH=none
BUG=chrome-os-partner:50645
TEST=with the rest of the patches applied kevin/gru boards boot into
     chrome OS with rollback counters read from/written to TPM2

Change-Id: Ie13696d4e5098a4ea5e338e84334d257e5c704a7
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/356751
Reviewed-by: Randall Spangler <rspangler@chromium.org>

3 files changed, 307 insertions, 178 deletions

diff --git a/firmware/include/tpm1_tss_constants.h b/firmware/include/tpm1_tss_constants.h
new file mode 100644
index 00000000..b4449ab8
--- /dev/null
+++ b/firmware/include/tpm1_tss_constants.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2016 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Some TPM constants and type definitions for standalone compilation for use
+ * in the firmware
+ */
+#ifndef __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H
+#define __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H
+
+#include <stdint.h>
+
+#define TPM_MAX_COMMAND_SIZE 4096
+#define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */
+#define TPM_PUBEK_SIZE 256
+#define TPM_PCR_DIGEST 20
+
+#define TPM_E_NON_FATAL 0x800
+
+#define TPM_E_AREA_LOCKED           ((uint32_t) 0x0000003c)
+#define TPM_E_BADINDEX              ((uint32_t) 0x00000002)
+#define TPM_E_BAD_PRESENCE          ((uint32_t) 0x0000002d)
+#define TPM_E_IOERROR               ((uint32_t) 0x0000001f)
+#define TPM_E_INVALID_POSTINIT      ((uint32_t) 0x00000026)
+#define TPM_E_MAXNVWRITES           ((uint32_t) 0x00000048)
+#define TPM_E_OWNER_SET             ((uint32_t) 0x00000014)
+
+#define TPM_E_NEEDS_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 1))
+#define TPM_E_DOING_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 2))
+
+#define TPM_NV_INDEX0            ((uint32_t) 0x00000000)
+#define TPM_NV_INDEX_LOCK        ((uint32_t) 0xffffffff)
+#define TPM_NV_PER_GLOBALLOCK    (((uint32_t) 1) << 15)
+#define TPM_NV_PER_PPWRITE       (((uint32_t) 1) << 0)
+#define TPM_NV_PER_READ_STCLEAR  (((uint32_t)1) << 31)
+#define TPM_NV_PER_WRITE_STCLEAR (((uint32_t)1) << 14)
+
+#define TPM_TAG_NV_ATTRIBUTES          ((uint16_t) 0x0017)
+#define TPM_TAG_NV_DATA_PUBLIC         ((uint16_t) 0x0018)
+
+#define TPM_TAG_RQU_COMMAND       ((uint16_t) 0xc1)
+#define TPM_TAG_RQU_AUTH1_COMMAND ((uint16_t) 0xc2)
+#define TPM_TAG_RQU_AUTH2_COMMAND ((uint16_t) 0xc3)
+
+#define TPM_TAG_RSP_COMMAND       ((uint16_t) 0xc4)
+#define TPM_TAG_RSP_AUTH1_COMMAND ((uint16_t) 0xc5)
+#define TPM_TAG_RSP_AUTH2_COMMAND ((uint16_t) 0xc6)
+
+typedef uint8_t TSS_BOOL;
+typedef uint8_t TPM_BOOL;
+typedef uint16_t TPM_TAG;
+typedef uint16_t TPM_STRUCTURE_TAG;
+typedef uint32_t TPM_NV_INDEX;
+typedef uint32_t TPM_NV_PER_ATTRIBUTES;
+typedef uint8_t TPM_LOCALITY_SELECTION;
+typedef uint32_t TPM_COMMAND_CODE;
+typedef uint16_t TPM_PHYSICAL_PRESENCE;
+typedef uint16_t TPM_STARTUP_TYPE;
+typedef uint32_t TPM_CAPABILITY_AREA;
+
+#define TPM_CAP_FLAG           ((uint32_t) 0x00000004)
+#define TPM_CAP_FLAG_PERMANENT ((uint32_t) 0x00000108)
+#define TPM_CAP_FLAG_VOLATILE  ((uint32_t) 0x00000109)
+
+#define TPM_CAP_PROPERTY       ((uint32_t) 0x00000005)
+#define TPM_CAP_PROP_OWNER     ((uint32_t) 0x00000111)
+#define TPM_CAP_NV_INDEX       ((uint32_t) 0x00000011)
+
+#define TPM_ST_CLEAR       ((uint16_t) 0x0001)
+#define TPM_ST_STATE       ((uint16_t) 0x0002)
+#define TPM_ST_DEACTIVATED ((uint16_t) 0x0003)
+
+#define TPM_LOC_FOUR   (((uint32_t)1)<<4)
+#define TPM_LOC_THREE  (((uint32_t)1)<<3)
+#define TPM_LOC_TWO    (((uint32_t)1)<<2)
+#define TPM_LOC_ONE    (((uint32_t)1)<<1)
+#define TPM_LOC_ZERO   (((uint32_t)1)<<0)
+
+#define TPM_PHYSICAL_PRESENCE_LOCK          ((uint16_t) 0x0004)
+#define TPM_PHYSICAL_PRESENCE_PRESENT       ((uint16_t) 0x0008)
+#define TPM_PHYSICAL_PRESENCE_NOTPRESENT    ((uint16_t) 0x0010)
+#define TPM_PHYSICAL_PRESENCE_CMD_ENABLE    ((uint16_t) 0x0020)
+#define TPM_PHYSICAL_PRESENCE_HW_ENABLE     ((uint16_t) 0x0040)
+#define TPM_PHYSICAL_PRESENCE_LIFETIME_LOCK ((uint16_t) 0x0080)
+#define TPM_PHYSICAL_PRESENCE_CMD_DISABLE   ((uint16_t) 0x0100)
+#define TPM_PHYSICAL_PRESENCE_HW_DISABLE    ((uint16_t) 0x0200)
+
+#define TPM_SHA1_160_HASH_LEN    0x14
+#define TPM_SHA1BASED_NONCE_LEN  TPM_SHA1_160_HASH_LEN
+
+typedef struct tdTPM_DIGEST
+{
+    uint8_t  digest[TPM_SHA1_160_HASH_LEN];
+} TPM_DIGEST;
+
+typedef TPM_DIGEST TPM_COMPOSITE_HASH;
+
+typedef struct tdTPM_PCR_SELECTION
+{
+    uint16_t  sizeOfSelect;
+    uint8_t   *pcrSelect;
+} TPM_PCR_SELECTION;
+
+typedef struct tdTPM_NV_ATTRIBUTES
+{
+    TPM_STRUCTURE_TAG     tag;
+    TPM_NV_PER_ATTRIBUTES attributes;
+} TPM_NV_ATTRIBUTES;
+
+typedef struct tdTPM_PCR_INFO_SHORT
+{
+    TPM_PCR_SELECTION      pcrSelection;
+    TPM_LOCALITY_SELECTION localityAtRelease;
+    TPM_COMPOSITE_HASH     digestAtRelease;
+}  TPM_PCR_INFO_SHORT;
+
+typedef struct tdTPM_PERMANENT_FLAGS
+{
+	TPM_STRUCTURE_TAG tag;
+	TSS_BOOL disable;
+	TSS_BOOL ownership;
+	TSS_BOOL deactivated;
+	TSS_BOOL readPubek;
+	TSS_BOOL disableOwnerClear;
+	TSS_BOOL allowMaintenance;
+	TSS_BOOL physicalPresenceLifetimeLock;
+	TSS_BOOL physicalPresenceHWEnable;
+	TSS_BOOL physicalPresenceCMDEnable;
+	TSS_BOOL CEKPUsed;
+	TSS_BOOL TPMpost;
+	TSS_BOOL TPMpostLock;
+	TSS_BOOL FIPS;
+	TSS_BOOL Operator;
+	TSS_BOOL enableRevokeEK;
+	TSS_BOOL nvLocked;
+	TSS_BOOL readSRKPub;
+	TSS_BOOL tpmEstablished;
+	TSS_BOOL maintenanceDone;
+	TSS_BOOL disableFullDALogicInfo;
+} TPM_PERMANENT_FLAGS;
+
+typedef struct tdTPM_STCLEAR_FLAGS{
+	TPM_STRUCTURE_TAG tag;
+	TSS_BOOL deactivated;
+	TSS_BOOL disableForceClear;
+	TSS_BOOL physicalPresence;
+	TSS_BOOL physicalPresenceLock;
+	TSS_BOOL bGlobalLock;
+} TPM_STCLEAR_FLAGS;
+
+typedef struct tdTPM_NV_DATA_PUBLIC
+{
+    TPM_STRUCTURE_TAG  tag;
+    TPM_NV_INDEX       nvIndex;
+    TPM_PCR_INFO_SHORT pcrInfoRead;
+    TPM_PCR_INFO_SHORT pcrInfoWrite;
+    TPM_NV_ATTRIBUTES  permission;
+    TPM_BOOL           bReadSTClear;
+    TPM_BOOL           bWriteSTClear;
+    TPM_BOOL           bWriteDefine;
+    uint32_t           dataSize;
+} TPM_NV_DATA_PUBLIC;
+
+typedef struct tdTPM_NONCE
+{
+    uint8_t nonce[TPM_SHA1BASED_NONCE_LEN];
+} TPM_NONCE;
+
+/* Ordinals */
+
+#define TPM_ORD_ContinueSelfTest  ((uint32_t) 0x00000053)
+#define TPM_ORD_Extend            ((uint32_t) 0x00000014)
+#define TPM_ORD_ForceClear        ((uint32_t) 0x0000005D)
+#define TPM_ORD_GetCapability     ((uint32_t) 0x00000065)
+#define TPM_ORD_GetRandom                         ((uint32_t) 0x00000046)
+#define TPM_ORD_NV_DefineSpace    ((uint32_t) 0x000000CC)
+#define TPM_ORD_NV_ReadValue      ((uint32_t) 0x000000CF)
+#define TPM_ORD_NV_WriteValue     ((uint32_t) 0x000000CD)
+#define TPM_ORD_PcrRead           ((uint32_t) 0x00000015)
+#define TPM_ORD_PhysicalEnable    ((uint32_t) 0x0000006F)
+#define TPM_ORD_PhysicalDisable   ((uint32_t) 0x00000070)
+#define TSC_ORD_PhysicalPresence  ((uint32_t) 0x4000000A)
+#define TPM_ORD_PhysicalSetDeactivated    ((uint32_t) 0x00000072)
+#define TPM_ORD_ReadPubek         ((uint32_t) 0x0000007C)
+#define TPM_ORD_SaveState         ((uint32_t) 0x00000098)
+#define TPM_ORD_SelfTestFull      ((uint32_t) 0x00000050)
+#define TPM_ORD_Startup           ((uint32_t) 0x00000099)
+
+#endif  /* ! __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM1_TSS_CONSTANTS_H */
diff --git a/firmware/include/tpm2_tss_constants.h b/firmware/include/tpm2_tss_constants.h
new file mode 100644
index 00000000..cec91e61
--- /dev/null
+++ b/firmware/include/tpm2_tss_constants.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2016 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Some TPM constants and type definitions for standalone compilation for use
+ * in the firmware
+ */
+
+#ifndef __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H
+#define __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H
+
+#define TPM_BUFFER_SIZE 256
+
+/* Tpm2 command tags. */
+#define TPM_ST_NO_SESSIONS 0x8001
+#define TPM_ST_SESSIONS    0x8002
+
+/* TPM2 command codes. */
+#define TPM2_NV_Write       ((TPM_CC)0x00000137)
+#define TPM2_NV_Read        ((TPM_CC)0x0000014E)
+
+/* TCG Spec defined, verify for TPM2. */
+#define TPM_E_BADINDEX              ((uint32_t) 0x00000002)
+#define TPM_E_INVALID_POSTINIT      ((uint32_t) 0x00000026)
+#define TPM_E_MAXNVWRITES           ((uint32_t) 0x00000048)
+
+#define HR_SHIFT               24
+#define TPM_HT_NV_INDEX        0x01
+#define HR_NV_INDEX           (TPM_HT_NV_INDEX <<  HR_SHIFT)
+#define TPM_RH_PLATFORM     0x4000000C
+#define TPM_RS_PW           0x40000009
+
+
+typedef uint32_t TPM_CC;
+typedef uint32_t TPM_HANDLE;
+typedef TPM_HANDLE TPMI_RH_NV_INDEX;
+
+typedef struct {
+	uint16_t      size;
+	uint8_t       *buffer;
+} TPM2B;
+
+typedef union {
+	struct {
+		uint16_t  size;
+		const uint8_t   *buffer;
+	} t;
+	TPM2B b;
+} TPM2B_MAX_NV_BUFFER;
+
+struct tpm2_nv_read_cmd {
+	TPMI_RH_NV_INDEX nvIndex;
+	uint16_t size;
+	uint16_t offset;
+};
+
+struct tpm2_nv_write_cmd {
+	TPMI_RH_NV_INDEX nvIndex;
+	TPM2B_MAX_NV_BUFFER data;
+	uint16_t offset;
+};
+
+/* Common command/response header. */
+struct tpm_header {
+	uint16_t tpm_tag;
+	uint32_t tpm_size;
+	TPM_CC tpm_code;
+} __attribute__((packed));
+
+struct nv_read_response {
+	uint32_t params_size;
+	TPM2B_MAX_NV_BUFFER buffer;
+};
+
+struct tpm2_session_attrs {
+	uint8_t continueSession : 1;
+	uint8_t auditExclusive  : 1;
+	uint8_t auditReset      : 1;
+	uint8_t reserved3_4     : 2;
+	uint8_t decrypt         : 1;
+	uint8_t encrypt         : 1;
+	uint8_t audit           : 1;
+};
+
+struct tpm2_session_header {
+	uint32_t session_handle;
+	uint16_t nonce_size;
+	uint8_t *nonce;
+	union {
+		struct tpm2_session_attrs session_attr_bits;
+		uint8_t session_attrs;
+	}  __attribute__((packed));
+	uint16_t auth_size;
+	uint8_t *auth;
+};
+
+struct tpm2_response {
+	struct tpm_header hdr;
+	union {
+		struct nv_read_response nvr;
+		struct tpm2_session_header def_space;
+	};
+};
+
+
+/* Temp stubs to quiet down compilation errors. */
+typedef struct {} TPM_PERMANENT_FLAGS;
+typedef struct {} TPM_STCLEAR_FLAGS;
+
+#endif  /* ! __VBOOT_REFERENCE_FIRMWARE_INCLUDE_TPM2_TSS_CONSTANTS_H */
diff --git a/firmware/include/tss_constants.h b/firmware/include/tss_constants.h
index edfdc3c4..e85fa817 100644
--- a/firmware/include/tss_constants.h
+++ b/firmware/include/tss_constants.h
@@ -2,33 +2,14 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Some TPM constants and type definitions for standalone compilation for use
- * in the firmware
  */
+
 #ifndef VBOOT_REFERENCE_TSS_CONSTANTS_H_
 #define VBOOT_REFERENCE_TSS_CONSTANTS_H_
 #include <stdint.h>
 
-#define TPM_MAX_COMMAND_SIZE 4096
-#define TPM_LARGE_ENOUGH_COMMAND_SIZE 256  /* saves space in the firmware */
-#define TPM_PUBEK_SIZE 256
-#define TPM_PCR_DIGEST 20
-
-#define TPM_E_NON_FATAL 0x800
-
 #define TPM_SUCCESS ((uint32_t) 0x00000000)
 
-#define TPM_E_AREA_LOCKED           ((uint32_t) 0x0000003c)
-#define TPM_E_BADINDEX              ((uint32_t) 0x00000002)
-#define TPM_E_BAD_PRESENCE          ((uint32_t) 0x0000002d)
-#define TPM_E_IOERROR               ((uint32_t) 0x0000001f)
-#define TPM_E_INVALID_POSTINIT      ((uint32_t) 0x00000026)
-#define TPM_E_MAXNVWRITES           ((uint32_t) 0x00000048)
-#define TPM_E_OWNER_SET             ((uint32_t) 0x00000014)
-
-#define TPM_E_NEEDS_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 1))
-#define TPM_E_DOING_SELFTEST ((uint32_t) (TPM_E_NON_FATAL + 2))
-
 #define TPM_E_ALREADY_INITIALIZED    ((uint32_t) 0x00005000)  /* vboot local */
 #define TPM_E_INTERNAL_INCONSISTENCY ((uint32_t) 0x00005001)  /* vboot local */
 #define TPM_E_MUST_REBOOT            ((uint32_t) 0x00005002)  /* vboot local */
@@ -43,163 +24,10 @@
 #define TPM_E_STRUCT_SIZE            ((uint32_t) 0x0000500b)  /* vboot local */
 #define TPM_E_STRUCT_VERSION         ((uint32_t) 0x0000500c)  /* vboot local */
 
-#define TPM_NV_INDEX0            ((uint32_t) 0x00000000)
-#define TPM_NV_INDEX_LOCK        ((uint32_t) 0xffffffff)
-#define TPM_NV_PER_GLOBALLOCK    (((uint32_t) 1) << 15)
-#define TPM_NV_PER_PPWRITE       (((uint32_t) 1) << 0)
-#define TPM_NV_PER_READ_STCLEAR  (((uint32_t)1) << 31)
-#define TPM_NV_PER_WRITE_STCLEAR (((uint32_t)1) << 14)
-
-#define TPM_TAG_NV_ATTRIBUTES          ((uint16_t) 0x0017)
-#define TPM_TAG_NV_DATA_PUBLIC         ((uint16_t) 0x0018)
-
-#define TPM_TAG_RQU_COMMAND       ((uint16_t) 0xc1)
-#define TPM_TAG_RQU_AUTH1_COMMAND ((uint16_t) 0xc2)
-#define TPM_TAG_RQU_AUTH2_COMMAND ((uint16_t) 0xc3)
-
-#define TPM_TAG_RSP_COMMAND       ((uint16_t) 0xc4)
-#define TPM_TAG_RSP_AUTH1_COMMAND ((uint16_t) 0xc5)
-#define TPM_TAG_RSP_AUTH2_COMMAND ((uint16_t) 0xc6)
-
-typedef uint8_t TSS_BOOL;
-typedef uint8_t TPM_BOOL;
-typedef uint16_t TPM_TAG;
-typedef uint16_t TPM_STRUCTURE_TAG;
-typedef uint32_t TPM_NV_INDEX;
-typedef uint32_t TPM_NV_PER_ATTRIBUTES;
-typedef uint8_t TPM_LOCALITY_SELECTION;
-typedef uint32_t TPM_COMMAND_CODE;
-typedef uint16_t TPM_PHYSICAL_PRESENCE;
-typedef uint16_t TPM_STARTUP_TYPE;
-typedef uint32_t TPM_CAPABILITY_AREA;
-
-#define TPM_CAP_FLAG           ((uint32_t) 0x00000004)
-#define TPM_CAP_FLAG_PERMANENT ((uint32_t) 0x00000108)
-#define TPM_CAP_FLAG_VOLATILE  ((uint32_t) 0x00000109)
-
-#define TPM_CAP_PROPERTY       ((uint32_t) 0x00000005)
-#define TPM_CAP_PROP_OWNER     ((uint32_t) 0x00000111)
-#define TPM_CAP_NV_INDEX       ((uint32_t) 0x00000011)
-
-#define TPM_ST_CLEAR       ((uint16_t) 0x0001)
-#define TPM_ST_STATE       ((uint16_t) 0x0002)
-#define TPM_ST_DEACTIVATED ((uint16_t) 0x0003)
-
-#define TPM_LOC_FOUR   (((uint32_t)1)<<4)
-#define TPM_LOC_THREE  (((uint32_t)1)<<3)
-#define TPM_LOC_TWO    (((uint32_t)1)<<2)
-#define TPM_LOC_ONE    (((uint32_t)1)<<1)
-#define TPM_LOC_ZERO   (((uint32_t)1)<<0)
-
-#define TPM_PHYSICAL_PRESENCE_LOCK          ((uint16_t) 0x0004)
-#define TPM_PHYSICAL_PRESENCE_PRESENT       ((uint16_t) 0x0008)
-#define TPM_PHYSICAL_PRESENCE_NOTPRESENT    ((uint16_t) 0x0010)
-#define TPM_PHYSICAL_PRESENCE_CMD_ENABLE    ((uint16_t) 0x0020)
-#define TPM_PHYSICAL_PRESENCE_HW_ENABLE     ((uint16_t) 0x0040)
-#define TPM_PHYSICAL_PRESENCE_LIFETIME_LOCK ((uint16_t) 0x0080)
-#define TPM_PHYSICAL_PRESENCE_CMD_DISABLE   ((uint16_t) 0x0100)
-#define TPM_PHYSICAL_PRESENCE_HW_DISABLE    ((uint16_t) 0x0200)
-
-#define TPM_SHA1_160_HASH_LEN    0x14
-#define TPM_SHA1BASED_NONCE_LEN  TPM_SHA1_160_HASH_LEN
-
-typedef struct tdTPM_DIGEST
-{
-    uint8_t  digest[TPM_SHA1_160_HASH_LEN];
-} TPM_DIGEST;
-
-typedef TPM_DIGEST TPM_COMPOSITE_HASH;
-
-typedef struct tdTPM_PCR_SELECTION
-{
-    uint16_t  sizeOfSelect;
-    uint8_t   *pcrSelect;
-} TPM_PCR_SELECTION;
-
-typedef struct tdTPM_NV_ATTRIBUTES
-{
-    TPM_STRUCTURE_TAG     tag;
-    TPM_NV_PER_ATTRIBUTES attributes;
-} TPM_NV_ATTRIBUTES;
-
-typedef struct tdTPM_PCR_INFO_SHORT
-{
-    TPM_PCR_SELECTION      pcrSelection;
-    TPM_LOCALITY_SELECTION localityAtRelease;
-    TPM_COMPOSITE_HASH     digestAtRelease;
-}  TPM_PCR_INFO_SHORT;
-
-typedef struct tdTPM_PERMANENT_FLAGS
-{
-	TPM_STRUCTURE_TAG tag;
-	TSS_BOOL disable;
-	TSS_BOOL ownership;
-	TSS_BOOL deactivated;
-	TSS_BOOL readPubek;
-	TSS_BOOL disableOwnerClear;
-	TSS_BOOL allowMaintenance;
-	TSS_BOOL physicalPresenceLifetimeLock;
-	TSS_BOOL physicalPresenceHWEnable;
-	TSS_BOOL physicalPresenceCMDEnable;
-	TSS_BOOL CEKPUsed;
-	TSS_BOOL TPMpost;
-	TSS_BOOL TPMpostLock;
-	TSS_BOOL FIPS;
-	TSS_BOOL Operator;
-	TSS_BOOL enableRevokeEK;
-	TSS_BOOL nvLocked;
-	TSS_BOOL readSRKPub;
-	TSS_BOOL tpmEstablished;
-	TSS_BOOL maintenanceDone;
-	TSS_BOOL disableFullDALogicInfo;
-} TPM_PERMANENT_FLAGS;
-
-typedef struct tdTPM_STCLEAR_FLAGS{
-	TPM_STRUCTURE_TAG tag;
-	TSS_BOOL deactivated;
-	TSS_BOOL disableForceClear;
-	TSS_BOOL physicalPresence;
-	TSS_BOOL physicalPresenceLock;
-	TSS_BOOL bGlobalLock;
-} TPM_STCLEAR_FLAGS;
-
-typedef struct tdTPM_NV_DATA_PUBLIC
-{
-    TPM_STRUCTURE_TAG  tag;
-    TPM_NV_INDEX       nvIndex;
-    TPM_PCR_INFO_SHORT pcrInfoRead;
-    TPM_PCR_INFO_SHORT pcrInfoWrite;
-    TPM_NV_ATTRIBUTES  permission;
-    TPM_BOOL           bReadSTClear;
-    TPM_BOOL           bWriteSTClear;
-    TPM_BOOL           bWriteDefine;
-    uint32_t           dataSize;
-} TPM_NV_DATA_PUBLIC;
-
-typedef struct tdTPM_NONCE
-{
-    uint8_t nonce[TPM_SHA1BASED_NONCE_LEN];
-} TPM_NONCE;
-
-/* Ordinals */
-
-#define TPM_ORD_ContinueSelfTest  ((uint32_t) 0x00000053)
-#define TPM_ORD_Extend            ((uint32_t) 0x00000014)
-#define TPM_ORD_ForceClear        ((uint32_t) 0x0000005D)
-#define TPM_ORD_GetCapability     ((uint32_t) 0x00000065)
-#define TPM_ORD_GetRandom                         ((uint32_t) 0x00000046)
-#define TPM_ORD_NV_DefineSpace    ((uint32_t) 0x000000CC)
-#define TPM_ORD_NV_ReadValue      ((uint32_t) 0x000000CF)
-#define TPM_ORD_NV_WriteValue     ((uint32_t) 0x000000CD)
-#define TPM_ORD_PcrRead           ((uint32_t) 0x00000015)
-#define TPM_ORD_PhysicalEnable    ((uint32_t) 0x0000006F)
-#define TPM_ORD_PhysicalDisable   ((uint32_t) 0x00000070)
-#define TSC_ORD_PhysicalPresence  ((uint32_t) 0x4000000A)
-#define TPM_ORD_PhysicalSetDeactivated    ((uint32_t) 0x00000072)
-#define TPM_ORD_ReadPubek         ((uint32_t) 0x0000007C)
-#define TPM_ORD_SaveState         ((uint32_t) 0x00000098)
-#define TPM_ORD_SelfTestFull      ((uint32_t) 0x00000050)
-#define TPM_ORD_Startup           ((uint32_t) 0x00000099)
-
+#ifdef TPM2_MODE
+#include "tpm2_tss_constants.h"
+#else
+#include "tpm1_tss_constants.h"
+#endif
 
 #endif  /* VBOOT_REFERENCE_TSS_CONSTANTS_H_ */