Changeset 91067 in vbox

Timestamp:

Sep 1, 2021 4:07:03 PM (3 years ago)

Author:

vboxsync

Message:

Devices/Security: Fix TPM not responding after a VM reset, bugref:10075

Location:

trunk/src/VBox/Devices/Security

Files:

• DevTpm.cpp (modified) (2 diffs)
• DrvTpmEmu.cpp (modified) (1 diff)

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

@@ -1408 +1408 @@
 static DECLCALLBACK(void) tpmR3Reset(PPDMDEVINS pDevIns)
 {
-    PDEVTPM pThis = PDMDEVINS_2_DATA(pDevIns, PDEVTPM);
-
-    pThis->enmState   = DEVTPMSTATE_IDLE;
-    pThis->bLoc       = TPM_NO_LOCALITY_SELECTED;
-    pThis->offCmdResp = 0;
+    PDEVTPM   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVTPM);
+    PDEVTPMCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVTPMCC);
+
+    pThis->enmState       = DEVTPMSTATE_IDLE;
+    pThis->bLoc           = TPM_NO_LOCALITY_SELECTED;
+    pThis->bmLocReqAcc    = 0;
+    pThis->bmLocSeizedAcc = 0;
+    pThis->offCmdResp     = 0;
     RT_ZERO(pThis->abCmdResp);
 
@@ -1420 +1423 @@
         pLoc->uRegIntEn  = 0;
         pLoc->uRegIntSts = 0;
+    }
+
+    if (pThisCC->pDrvTpm)
+    {
+        int rc = pThisCC->pDrvTpm->pfnReset(pThisCC->pDrvTpm);
+        AssertRC(rc);
     }
 }

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

@@ -657 +657 @@
 {
     RT_NOREF(pInterface);
-    return VERR_NOT_IMPLEMENTED;
+    return VINF_SUCCESS;
 }