Changeset 91083 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2021 8:51:54 AM (3 years ago)

Author:

vboxsync

Message:

Devices/DevACPI,vboxtpm.dsl: Add support for TPM 1.2 operation, bugref:10075

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (3 diffs)
• vbox-tpm.dsl (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -968 +968 @@
 #define ACPITBL_TPM20_START_METHOD_CRB      UINT16_C(7)
 /** @} */
+
+
+/**
+ * TPM: The ACPI table for a TPM 1.2 device
+  * (from: https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdf).
+ */
+typedef struct ACPITBLTCPA
+{
+    /** The common ACPI table header. */
+    ACPITBLHEADER       Hdr;
+    /** The platform class. */
+    uint16_t            u16PlatCls;
+    /** Log Area Minimum Length. */
+    uint32_t            u32Laml;
+    /** Log Area Start Address. */
+    uint64_t            u64Lasa;
+} ACPITBLTCPA;
+AssertCompileSize(ACPITBLTCPA, 50);
+
+/** Revision of the TPM1.2 ACPI table. */
+#define ACPI_TCPA_REVISION                  2
+/** LAML region size. */
+#define ACPI_TCPA_LAML_SZ                   _16K
+
+
+/** @name Possible values for the ACPITBLTCPA::u16PlatCls member.
+ * @{ */
+/** Client platform. */
+#define ACPI_TCPA_PLAT_CLS_CLIENT           UINT16_C(0)
+/** @} */
 #endif
 
@@ -3502 +3532 @@
 static void acpiR3SetupTpm(PPDMDEVINS pDevIns, PACPISTATE pThis, RTGCPHYS32 addr)
 {
-    ACPITBLTPM20 Tpm2Tbl;
-    RT_ZERO(Tpm2Tbl);
-
-    acpiR3PrepareHeader(pThis, &Tpm2Tbl.Hdr, "TPM2", sizeof(ACPITBLTPM20), ACPI_TPM20_REVISION);
-
-    switch (pThis->enmTpmMode)
-    {
-        case ACPITPMMODE_CRB_2_0:
-            Tpm2Tbl.u32StartMethod       = ACPITBL_TPM20_START_METHOD_CRB;
-            Tpm2Tbl.u64BaseAddrCrbOrFifo = pThis->GCPhysTpmMmio;
-            break;
-        case ACPITPMMODE_TIS_1_2:
-        case ACPITPMMODE_FIFO_2_0:
-            Tpm2Tbl.u32StartMethod = ACPITBL_TPM20_START_METHOD_TIS12;
-            break;
-        case ACPITPMMODE_DISABLED: /* Should never be called with the TPM disabled. */
-        default:
-            AssertFailed();
-    }
-
-    Tpm2Tbl.u16PlatCls = ACPITBL_TPM20_PLAT_CLS_CLIENT;
-
-    /* Finally, compute checksum. */
-    Tpm2Tbl.Hdr.u8Checksum = acpiR3Checksum(&Tpm2Tbl, sizeof(Tpm2Tbl));
-
-    /* Plant the ACPI table. */
-    acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&Tpm2Tbl, sizeof(Tpm2Tbl));
+    if (pThis->enmTpmMode == ACPITPMMODE_TIS_1_2)
+    {
+        ACPITBLTCPA TcpaTbl;
+        RT_ZERO(TcpaTbl);
+
+        acpiR3PrepareHeader(pThis, &TcpaTbl.Hdr, "TCPA", sizeof(TcpaTbl), ACPI_TCPA_REVISION);
+
+        TcpaTbl.u16PlatCls = ACPI_TCPA_PLAT_CLS_CLIENT;
+        TcpaTbl.u32Laml    = ACPI_TCPA_LAML_SZ;
+        TcpaTbl.u64Lasa    = addr + sizeof(TcpaTbl);
+
+        /* Finally, compute checksum. */
+        TcpaTbl.Hdr.u8Checksum = acpiR3Checksum(&TcpaTbl, sizeof(TcpaTbl));
+
+        /* Plant the ACPI table. */
+        acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&TcpaTbl, sizeof(TcpaTbl));
+    }
+    else
+    {
+        ACPITBLTPM20 Tpm2Tbl;
+        RT_ZERO(Tpm2Tbl);
+
+        acpiR3PrepareHeader(pThis, &Tpm2Tbl.Hdr, "TPM2", sizeof(ACPITBLTPM20), ACPI_TPM20_REVISION);
+
+        switch (pThis->enmTpmMode)
+        {
+            case ACPITPMMODE_CRB_2_0:
+                Tpm2Tbl.u32StartMethod       = ACPITBL_TPM20_START_METHOD_CRB;
+                Tpm2Tbl.u64BaseAddrCrbOrFifo = pThis->GCPhysTpmMmio;
+                break;
+            case ACPITPMMODE_FIFO_2_0:
+                Tpm2Tbl.u32StartMethod = ACPITBL_TPM20_START_METHOD_TIS12;
+                break;
+            case ACPITPMMODE_TIS_1_2: /* Handled above. */
+            case ACPITPMMODE_DISABLED: /* Should never be called with the TPM disabled. */
+            default:
+                AssertFailed();
+        }
+
+        Tpm2Tbl.u16PlatCls = ACPITBL_TPM20_PLAT_CLS_CLIENT;
+
+        /* Finally, compute checksum. */
+        Tpm2Tbl.Hdr.u8Checksum = acpiR3Checksum(&Tpm2Tbl, sizeof(Tpm2Tbl));
+
+        /* Plant the ACPI table. */
+        acpiR3PhysCopy(pDevIns, addr, (const uint8_t *)&Tpm2Tbl, sizeof(Tpm2Tbl));
+    }
 }
 #endif
@@ -3797 +3847 @@
     {
         GCPhysTpm = GCPhysCur;
-        GCPhysCur = RT_ALIGN_32(GCPhysCur + sizeof(ACPITBLTPM20), 16); /** @todo TPM1.2 */
+
+        if (pThis->enmTpmMode == ACPITPMMODE_TIS_1_2)
+            GCPhysCur = RT_ALIGN_32(GCPhysCur + sizeof(ACPITBLTCPA) + ACPI_TCPA_LAML_SZ, 16);
+        else
+            GCPhysCur = RT_ALIGN_32(GCPhysCur + sizeof(ACPITBLTPM20), 16);
 
         rc = acpiPrepareTpmSsdt(pDevIns, &pvSsdtTpmCode, &cbSsdtTpm);

trunk/src/VBox/Devices/PC/vbox-tpm.dsl

@@ -22 +22 @@
         Device (TPM)
         {
-            Name (_HID, "MSFT0101")
-            Name (_CID, "MSFT0101")
-            Name (_STR, Unicode ("TPM 2.0 Device"))
+            Method (_HID, 0, NotSerialized)
+            {
+                If (LEqual(IFID, One))
+                {
+                    Return ("PNP0C31")
+                }
+                Else
+                {
+                    Return ("MSFT0101")
+                }
+            }
+
+            Method (_CID, 0, NotSerialized)
+            {
+                If (LEqual(IFID, One))
+                {
+                    Return ("PNP0C31")
+                }
+                Else
+                {
+                    Return ("MSFT0101")
+                }
+            }
+
+            Method (_STR, 0, NotSerialized)
+            {
+                If (LEqual(IFID, One))
+                {
+                    Return (Unicode ("TPM 1.2 Device"))
+                }
+                Else
+                {
+                    Return (Unicode ("TPM 2.0 Device"))
+                }
+            }
 
             Method (_STA, 0, NotSerialized)
@@ -32 +64 @@
 
             OperationRegion (TPMR, SystemMemory, 0xFED40000, 0x5000)
+            Field(TPMR, AnyAcc, NoLock, Preserve)
+            {
+                Offset(0x30),
+                IFID,       1,
+            }
 
             Name(RES, ResourceTemplate()