Changeset 102991 in vbox for trunk/src/VBox/Devices/Security

Timestamp:

Jan 22, 2024 5:30:30 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161223

Message:

Devices/Security/DevTpm: Fix device identification, the UEFI update introduced a new sanity check in the TPM driver code making TCG2 fail and reporting to TPM

File:

• trunk/src/VBox/Devices/Security/DevTpm.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Security/DevTpm.cpp

@@ -767 +767 @@
                   | TPM_FIFO_LOCALITY_REG_IF_CAP_INT_LVL_LOW
                   | TPM_FIFO_LOCALITY_REG_IF_CAP_INT_CMD_RDY
-                  | TPM_FIFO_LOCALITY_REG_IF_CAP_DATA_XFER_SZ_SET(TPM_FIFO_LOCALITY_REG_IF_CAP_DATA_XFER_SZ_64B)
-                  | TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_SET(TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_IF_1_3); /** @todo Make some of them configurable? */
+                  | TPM_FIFO_LOCALITY_REG_IF_CAP_DATA_XFER_SZ_SET(TPM_FIFO_LOCALITY_REG_IF_CAP_DATA_XFER_SZ_64B); /** @todo Make some of them configurable? */
+            if (pThis->enmTpmVers == TPMVERSION_1_2)
+                u64 |= TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_SET(TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_IF_1_3);
+            else
+                u64 |= TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_SET(TPM_FIFO_LOCALITY_REG_IF_CAP_IF_VERSION_IF_1_3_TPM2);
             break;
         case TPM_FIFO_LOCALITY_REG_STS:
@@ -800 +803 @@
                   | TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_64B)
                   | TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_GET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_FIFO)
-                  | TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_LOCK;
-            if (pThis->enmTpmVers == TPMVERSION_1_2)
-                u64 |= TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_TIS1_3);
-            else
-                u64 |= TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_FIFO_TPM20);
+                  | TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_LOCK
+                  | TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_TIS1_3);
 
             if (pThis->fLocChangeSup) /* Only advertise the locality capability if the driver below supports it. */