Changeset 90996 in vbox for trunk/src

Timestamp:

Aug 30, 2021 12:57:49 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Security: Only advertise the multiple localities supported capability if the driver below supports it, bugref:10075

Location:

trunk/src/VBox/Devices/Security

Files:

• DevTpm.cpp (modified) (7 diffs)
• DrvTpmEmu.cpp (modified) (2 diffs)
• DrvTpmHost.cpp (modified) (2 diffs)

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

@@ -205 +205 @@
 /** TPM start of HASH operation signal register for locality 4. */
 #define TPM_FIFO_LOCALITY_REG_HASH_START                     0x28
+
+/** Locality interface ID register. */
+#define TPM_FIFO_LOCALITY_REG_INTF_ID                         0x30
+/** Interface type field. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_MASK           UINT32_C(0xf)
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SHIFT          0
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SET(a)         ((a) << TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_SHIFT)
+/** FIFO interface as defined in PTP for TPM 2.0 is active. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_FIFO_TPM20    0x0
+/** CRB interface is active. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_CRB           0x1
+/** FIFO interface as defined in TIS 1.3 is active. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_TYPE_TIS1_3        0xf
+/** Interface type field. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_MASK           UINT32_C(0xf)
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_SHIFT          4
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_SET(a)         ((a) << TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_SHIFT)
+/** FIFO interface for TPM 2.0 */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_FIFO          0
+/** CRB interface version 0. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_CRB           1
+/** Only locality 0 is supported when clear, set if 5 localities are supported. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_LOCALITY           RT_BIT(8)
+/** Maximum transfer size support. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_MASK   0x1800
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SHIFT  11
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SET(a) ((a) << TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SHIFT)
+/** Only legacy transfers supported. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_LEGACY 0x0
+/** 8B maximum transfer size. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_8B   0x1
+/** 32B maximum transfer size. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_32B  0x2
+/** 64B maximum transfer size. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_64B  0x3
+/** FIFO interface is supported and may be selected. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_FIFO               RT_BIT(13)
+/** CRB interface is supported and may be selected. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_CRB                RT_BIT(14)
+/** Interrupt polarity configuration. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_MASK            0x60000
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_SHIFT           17
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_SET(a)          ((a) << TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_SHIFT)
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_GET(a)          (((a) & TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_MASK) >> TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_SHIFT)
+/** Selects the FIFO interface, takes effect on next _TPM_INIT. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_FIFO           0
+/** Selects the CRB interface, takes effect on next _TPM_INIT. */
+#  define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_CRB            1
+/** Locks the interface selector field and prevents further changes. */
+# define TPM_FIFO_LOCALITY_REG_INTF_ID_IF_SEL_LOCK            RT_BIT(19)
+
+
 /** Extended data FIFO read/write register. */
 #define TPM_FIFO_LOCALITY_REG_XDATA_FIFO                     0x80
@@ -274 +326 @@
 # define TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_MASK   0x1800
 # define TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SHIFT  11
-# define TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SET(a) ((a) << TPM_FIFO_LOCALITY_REG_IF_CAP_DATA_XFER_SZ_SHIFT)
+# define TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SET(a) ((a) << TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SHIFT)
 /** Only legacy transfers supported. */
 #  define TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_LEGACY 0x0
@@ -439 +491 @@
     /** Flag whether CRB access mode is used. */
     bool                            fCrb;
+    /** Flag whether the TPM driver below supportes other localities than 0. */
+    bool                            fLocChangeSup;
 
     /** Currently selected locality. */
@@ -699 +753 @@
             }
             break;
+        case TPM_FIFO_LOCALITY_REG_INTF_ID:
+            u64 =   TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_SET(TPM_FIFO_LOCALITY_REG_INTF_ID_IF_VERS_FIFO)
+                  | 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);
+
+            if (pThis->fLocChangeSup) /* Only advertise the locality capability if the driver below supports it. */
+                u64 |= TPM_FIFO_LOCALITY_REG_INTF_ID_CAP_LOCALITY;
+            break;
         case TPM_FIFO_LOCALITY_REG_DID_VID:
             u64 = RT_H2BE_U32(RT_MAKE_U32(pThis->uVenId, pThis->uDevId));
@@ -897 +964 @@
             u64 =   TPM_CRB_LOCALITY_REG_INTF_ID_IF_TYPE_SET(TPM_CRB_LOCALITY_REG_INTF_ID_IF_TYPE_CRB)
                   | TPM_CRB_LOCALITY_REG_INTF_ID_IF_VERS_SET(TPM_CRB_LOCALITY_REG_INTF_ID_IF_VERS_CRB)
-                  | TPM_CRB_LOCALITY_REG_INTF_ID_CAP_LOCALITY
                   | TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_SET(TPM_CRB_LOCALITY_REG_INTF_ID_CAP_DATA_XFER_SZ_64B)
                   | TPM_CRB_LOCALITY_REG_INTF_ID_CAP_CRB
@@ -905 +971 @@
                   | TPM_CRB_LOCALITY_REG_INTF_ID_VID_SET(pThis->uVenId)
                   | TPM_CRB_LOCALITY_REG_INTF_ID_DID_SET(pThis->uDevId);
+
+            if (pThis->fLocChangeSup) /* Only advertise the locality capability if the driver below supports it. */
+                u64 |= TPM_CRB_LOCALITY_REG_INTF_ID_CAP_LOCALITY;
+
             break;
         case TPM_CRB_LOCALITY_REG_CTRL_REQ:
@@ -1448 +1518 @@
         if (pThis->enmTpmVers == TPMVERSION_UNKNOWN)
             return PDMDEV_SET_ERROR(pDevIns, VERR_NOT_SUPPORTED, N_("The emulated TPM version is not supported"));
+
+        pThis->fLocChangeSup = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
     {
+        pThis->fLocChangeSup = false;
+
         pThisCC->pDrvBase = NULL;
         pThisCC->pDrvTpm  = NULL;

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

@@ -602 +602 @@
 
 
+/** @interface_method_impl{PDMITPMCONNECTOR,pfnGetLocalityMax} */
+static DECLCALLBACK(uint32_t) drvTpmEmuGetLocalityMax(PPDMITPMCONNECTOR pInterface)
+{
+    RT_NOREF(pInterface);
+    return 4;
+}
+
+
 /** @interface_method_impl{PDMITPMCONNECTOR,pfnGetEstablishedFlag} */
 static DECLCALLBACK(bool) drvTpmEmuGetEstablishedFlag(PPDMITPMCONNECTOR pInterface)
@@ -795 +803 @@
     pThis->ITpmConnector.pfnReset                   = drvTpmEmuReset;
     pThis->ITpmConnector.pfnGetVersion              = drvTpmEmuGetVersion;
+    pThis->ITpmConnector.pfnGetLocalityMax          = drvTpmEmuGetLocalityMax;
     pThis->ITpmConnector.pfnGetEstablishedFlag      = drvTpmEmuGetEstablishedFlag;
     pThis->ITpmConnector.pfnResetEstablishedFlag    = drvTpmEmuResetEstablishedFlag;

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

@@ -109 +109 @@
     }
 
-    AssertFailed(); /* Shouldnb't get here. */
+    AssertFailed(); /* Shouldn't get here. */
     return TPMVERSION_UNKNOWN;
+}
+
+
+/** @interface_method_impl{PDMITPMCONNECTOR,pfnGetLocalityMax} */
+static DECLCALLBACK(uint32_t) drvTpmHostGetLocalityMax(PPDMITPMCONNECTOR pInterface)
+{
+    PDRVTPMHOST pThis = RT_FROM_MEMBER(pInterface, DRVTPMHOST, ITpmConnector);
+    return RTTpmGetLocalityMax(pThis->hTpm);
 }
 
@@ -200 +208 @@
     pThis->ITpmConnector.pfnReset                   = drvTpmHostReset;
     pThis->ITpmConnector.pfnGetVersion              = drvTpmHostGetVersion;
+    pThis->ITpmConnector.pfnGetLocalityMax          = drvTpmHostGetLocalityMax;
     pThis->ITpmConnector.pfnGetEstablishedFlag      = drvTpmHostGetEstablishedFlag;
     pThis->ITpmConnector.pfnResetEstablishedFlag    = drvTpmHostResetEstablishedFlag;