Changeset 91084 in vbox for trunk/src/VBox/Devices/Security/DevTpm.cpp

Timestamp:

Sep 2, 2021 9:18:03 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Security/DevTpm: Implement some todos, bugref:10075

File:

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

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

@@ -493 +493 @@
     /** Flag whether the TPM driver below supportes other localities than 0. */
     bool                            fLocChangeSup;
+    /** Flag whether the establishment bit is set. */
+    bool                            fEstablishmentSet;
 
     /** Currently selected locality. */
@@ -709 +711 @@
                 && pThis->bmLocReqAcc & RT_BIT_32(bLoc))
                 u64 |= TPM_FIFO_LOCALITY_REG_ACCESS_REQUEST_USE;
-            /** @todo Establishment bit. */
+            if (pThis->fEstablishmentSet)
+                u64 |= TPM_FIFO_LOCALITY_REG_ACCESS_ESTABLISHMENT;
             break;
         case TPM_FIFO_LOCALITY_REG_INT_ENABLE:
@@ -800 +803 @@
                                      uint8_t bLoc, uint32_t uReg, uint64_t u64, size_t cb)
 {
-    RT_NOREF(pDevIns);
+#ifdef IN_RING3
+    PDEVTPMR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVTPMR3);
+#endif
 
     /* Special path for the data buffer. */
@@ -871 +876 @@
             if (bLoc != pThis->bLoc)
                 break;
-            /** @todo */
+            pLoc->uRegIntEn = u32;
+            tpmLocIrqUpdate(pDevIns, pThis, pLoc);
             break;
         case TPM_FIFO_LOCALITY_REG_INT_STS:
@@ -904 +910 @@
                 rc = PDMDevHlpTaskTrigger(pDevIns, pThis->hTpmCmdTask);
             }
-            /** @todo Cancel and reset establishment. */
+
+            if (   (u64 & TPM_FIFO_LOCALITY_REG_STS_RST_ESTABLISHMENT)
+                && pThis->bLoc >= 3
+                && (   pThis->enmState == DEVTPMSTATE_IDLE
+                    || pThis->enmState == DEVTPMSTATE_CMD_COMPLETION))
+            {
+#ifndef IN_RING3
+                rc = VINF_IOM_R3_MMIO_WRITE;
+                break;
+#else
+                if (pThisCC->pDrvTpm)
+                {
+                    int rc2 = pThisCC->pDrvTpm->pfnResetEstablishedFlag(pThisCC->pDrvTpm, pThis->bLoc);
+                    if (RT_SUCCESS(rc2))
+                        pThis->fEstablishmentSet = false;
+                    else
+                        pThis->enmState == DEVTPMSTATE_FATAL_ERROR;
+                }
+                else
+                    pThis->fEstablishmentSet = false;
+#endif
+            }
+
+            if (   (u64 & TPM_FIFO_LOCALITY_REG_STS_CMD_CANCEL)
+                && pThis->enmState == DEVTPMSTATE_CMD_EXEC)
+            {
+#ifndef IN_RING3
+                rc = VINF_IOM_R3_MMIO_WRITE;
+                break;
+#else
+                if (pThisCC->pDrvTpm)
+                {
+                    pThis->enmState = DEVTPMSTATE_CMD_CANCEL;
+                    int rc2 = pThisCC->pDrvTpm->pfnCmdCancel(pThisCC->pDrvTpm);
+                    if (RT_FAILURE(rc2))
+                        pThis->enmState == DEVTPMSTATE_FATAL_ERROR;
+                }
+#endif
+            }
+
             break;
         case TPM_FIFO_LOCALITY_REG_INT_VEC:
@@ -954 +999 @@
                      ? TPM_CRB_LOCALITY_REG_STATE_ACTIVE_LOC_SET(pThis->bLoc) | TPM_CRB_LOCALITY_REG_STATE_LOC_ASSIGNED
                      : TPM_CRB_LOCALITY_REG_STATE_ACTIVE_LOC_SET(0));
+            if (pThis->fEstablishmentSet)
+                u64 |= TPM_CRB_LOCALITY_REG_ESTABLISHMENT;
             break;
         case TPM_CRB_LOCALITY_REG_STS:
@@ -1061 +1108 @@
                                     uint8_t bLoc, uint32_t uReg, uint64_t u64, size_t cb)
 {
+#ifdef IN_RING3
+    PDEVTPMR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVTPMR3);
+#endif
+
     VBOXSTRICTRC rc = VINF_SUCCESS;
     uint32_t u32 = (uint32_t)u64;
@@ -1081 +1132 @@
         {
             /* See chapter 6.5.3.2.2.1. */
-#if 0
-            if (u64 & TPM_CRB_LOCALITY_REG_CTRL_RST_ESTABLISHMENT)
-                /** @todo */;
+            if (   (u64 & TPM_CRB_LOCALITY_REG_CTRL_RST_ESTABLISHMENT)
+                && pThis->bLoc >= 3
+                && (   pThis->enmState == DEVTPMSTATE_IDLE
+                    || pThis->enmState == DEVTPMSTATE_CMD_COMPLETION))
+            {
+#ifndef IN_RING3
+                rc = VINF_IOM_R3_MMIO_WRITE;
+                break;
+#else
+                if (pThisCC->pDrvTpm)
+                {
+                    int rc2 = pThisCC->pDrvTpm->pfnResetEstablishedFlag(pThisCC->pDrvTpm, pThis->bLoc);
+                    if (RT_SUCCESS(rc2))
+                        pThis->fEstablishmentSet = false;
+                    else
+                        pThis->enmState == DEVTPMSTATE_FATAL_ERROR;
+                }
+                else
+                    pThis->fEstablishmentSet = false;
 #endif
+            }
 
             /*
@@ -1095 +1163 @@
                 && bLoc > pThis->bLoc)
             {
+                if (pThis->enmState == DEVTPMSTATE_CMD_EXEC)
+                {
+#ifndef IN_RING3
+                    rc = VINF_IOM_R3_MMIO_WRITE;
+                    break;
+#else
+                    pThis->enmState = DEVTPMSTATE_CMD_CANCEL;
+                    if (pThisCC->pDrvTpm)
+                    {
+                        int rc2 = pThisCC->pDrvTpm->pfnCmdCancel(pThisCC->pDrvTpm);
+                        if (RT_FAILURE(rc2))
+                            pThis->enmState == DEVTPMSTATE_FATAL_ERROR;
+                        else
+                        {
+                            pThis->enmState = DEVTPMSTATE_CMD_COMPLETION;
+                            tpmLocSetIntSts(pDevIns, pThis, pLoc, TPM_CRB_LOCALITY_REG_INT_STS_START);
+                        }
+                    }
+#endif
+                }
+
                 pThis->bmLocSeizedAcc |= RT_BIT_32(pThis->bLoc);
-                /** @todo Abort command. */
                 pThis->bLoc = bLoc;
             }
@@ -1150 +1238 @@
                 && u32 == 0x1)
             {
+#ifndef IN_RING3
+                rc = VINF_IOM_R3_MMIO_WRITE;
+                break;
+#else
                 pThis->enmState = DEVTPMSTATE_CMD_CANCEL;
-                /** @todo Cancel. */
-                pThis->enmState = DEVTPMSTATE_CMD_COMPLETION;
-                tpmLocSetIntSts(pDevIns, pThis, pLoc, TPM_CRB_LOCALITY_REG_INT_STS_START);
+                if (pThisCC->pDrvTpm)
+                {
+                    int rc2 = pThisCC->pDrvTpm->pfnCmdCancel(pThisCC->pDrvTpm);
+                    if (RT_FAILURE(rc2))
+                        pThis->enmState == DEVTPMSTATE_FATAL_ERROR;
+                    else
+                    {
+                        pThis->enmState = DEVTPMSTATE_CMD_COMPLETION;
+                        tpmLocSetIntSts(pDevIns, pThis, pLoc, TPM_CRB_LOCALITY_REG_INT_STS_START);
+                    }
+                }
+#endif
             }
             break;
@@ -1521 +1622 @@
         AssertLogRelMsgReturn(pThisCC->pDrvTpm, ("TPM#%d: Driver is missing the TPM interface.\n", iInstance), VERR_PDM_MISSING_INTERFACE);
 
-        pThis->fLocChangeSup = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;
-        pThis->cbCmdResp     = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
+        pThis->fLocChangeSup     = pThisCC->pDrvTpm->pfnGetLocalityMax(pThisCC->pDrvTpm) > 0;
+        pThis->fEstablishmentSet = pThisCC->pDrvTpm->pfnGetEstablishedFlag(pThisCC->pDrvTpm);
+        pThis->cbCmdResp         = RT_MIN(pThisCC->pDrvTpm->pfnGetBufferSize(pThisCC->pDrvTpm), TPM_DATA_BUFFER_SIZE_MAX);
 
         /* Startup the TPM here instead of in the power on callback as we can convey errors here to the upper layer. */
@@ -1535 +1637 @@
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
     {
-        pThis->fLocChangeSup = false;
+        pThis->fLocChangeSup     = false;
+        pThis->fEstablishmentSet = false;
 
         pThisCC->pDrvBase = NULL;