SecurityPkg: Tcg2Dxe: Report correct FinalEventLog size

[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Config / Tcg2ConfigNvData.h

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
index 65044c2bd5e9bd4adf7df67f171c7237fb2856ef..20eaa508fad238c19c35bffff63539a053174892 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for NV data structure definition.\r
 \r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_TCG2_EVENT_LOG_FORMAT_ALL           (EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 | EFI_TCG2_EVENT_LOG_FORMAT_TCG_2)\r
 \r
 #define TCG2_CONFIGURATION_VARSTORE_ID  0x0001\r
+#define TCG2_CONFIGURATION_INFO_VARSTORE_ID  0x0002\r
 #define TCG2_CONFIGURATION_FORM_ID      0x0001\r
 \r
 #define KEY_TPM_DEVICE                                 0x2000\r
@@ -39,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define KEY_TPM2_PCR_BANKS_REQUEST_2            0x2005\r
 #define KEY_TPM2_PCR_BANKS_REQUEST_3            0x2006\r
 #define KEY_TPM2_PCR_BANKS_REQUEST_4            0x2007\r
+#define KEY_TPM_DEVICE_INTERFACE                       0x2008\r
 \r
 #define TPM_DEVICE_NULL           0\r
 #define TPM_DEVICE_1_2            1\r
@@ -47,6 +49,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TPM_DEVICE_MAX            TPM_DEVICE_2_0_DTPM\r
 #define TPM_DEVICE_DEFAULT        TPM_DEVICE_1_2\r
 \r
+#define TPM_DEVICE_INTERFACE_TIS       0\r
+#define TPM_DEVICE_INTERFACE_PTP_FIFO  1\r
+#define TPM_DEVICE_INTERFACE_PTP_CRB   2\r
+#define TPM_DEVICE_INTERFACE_MAX       TPM_DEVICE_INTERFACE_PTP_FIFO\r
+#define TPM_DEVICE_INTERFACE_DEFAULT   TPM_DEVICE_INTERFACE_PTP_CRB\r
+\r
 #define TCG2_PROTOCOL_VERSION_DEFAULT        0x0001\r
 #define EFI_TCG2_EVENT_LOG_FORMAT_DEFAULT    EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2\r
 \r
@@ -57,6 +65,17 @@ typedef struct {
   UINT8   TpmDevice;\r
 } TCG2_CONFIGURATION;\r
 \r
+typedef struct {\r
+  BOOLEAN  Sha1Supported;\r
+  BOOLEAN  Sha256Supported;\r
+  BOOLEAN  Sha384Supported;\r
+  BOOLEAN  Sha512Supported;\r
+  BOOLEAN  Sm3Supported;\r
+  UINT8    TpmDeviceInterfaceAttempt;\r
+  BOOLEAN  TpmDeviceInterfacePtpFifoSupported;\r
+  BOOLEAN  TpmDeviceInterfacePtpCrbSupported;\r
+} TCG2_CONFIGURATION_INFO;\r
+\r
 //\r
 // Variable saved for S3, TPM detected, only valid in S3 path.\r
 // This variable is ReadOnly.\r
@@ -65,7 +84,8 @@ typedef struct {
   UINT8   TpmDeviceDetected;\r
 } TCG2_DEVICE_DETECTION;\r
 \r
-#define TCG2_STORAGE_NAME  L"TCG2_CONFIGURATION"\r
+#define TCG2_STORAGE_NAME           L"TCG2_CONFIGURATION"\r
+#define TCG2_STORAGE_INFO_NAME      L"TCG2_CONFIGURATION_INFO"\r
 #define TCG2_DEVICE_DETECTION_NAME  L"TCG2_DEVICE_DETECTION"\r
 \r
 #define TPM_INSTANCE_ID_LIST  { \\r