Changeset 102995 in vbox for trunk/src

Timestamp:

Jan 23, 2024 7:54:57 AM (11 months ago)

Author:

vboxsync

Message:

Devices/Security/DevTpm: Addendum for r161223, need to keep the version distinction in the interface ID register so Windows 11 detects the TPM

File:

• trunk/src/VBox/Devices/Security/DevTpm.cpp (modified) (1 diff)

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

@@ -803 +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
-                  | TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_TIS1_3);
+                  | 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);
 
             if (pThis->fLocChangeSup) /* Only advertise the locality capability if the driver below supports it. */