Changeset 81186 in vbox

Timestamp:

Oct 9, 2019 2:01:16 PM (5 years ago)

Author:

vboxsync

Message:

OHCI: Improved in-flight URB tracking (see bugref:9571).

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -1193 +1193 @@
      */
     pThis->RootHub.pIRhConn->pfnCancelAllUrbs(pThis->RootHub.pIRhConn);
+    Assert(pThis->cInFlight == 0);
 
     /*
@@ -2812 +2813 @@
     ohciR3Lock(pThis);
 
-    /* Do nothing if the HC encountered an unrecoverable error. */
+    int cFmAge = ohciR3InFlightRemoveUrb(pThis, pUrb);
+
+    /* Do nothing requiring memory access if the HC encountered an unrecoverable error. */
     if (!(pThis->intr_status & OHCI_INTR_UNRECOVERABLE_ERROR))
     {
@@ -2831 +2834 @@
          * with the data copying, buffer pointer advancing and error handling.
          */
-        int cFmAge = ohciR3InFlightRemoveUrb(pThis, pUrb);
         if (pUrb->enmStatus == VUSBSTATUS_UNDO)
         {
@@ -3046 +3048 @@
     Log(("ohciR3ServiceTd: failed submitting TdAddr=%#010x EdAddr=%#010x pUrb=%p!!\n",
          TdAddr, EdAddr, pUrb));
+    ohciR3InFlightRemove(pThis, TdAddr);
     VUSBIRhFreeUrb(pThis->RootHub.pIRhConn, pUrb);
-    ohciR3InFlightRemove(pThis, TdAddr);
     return false;
 }
@@ -3216 +3218 @@
     Log(("ohciR3ServiceTdMultiple: failed submitting pUrb=%p cbData=%#x EdAddr=%#010x cTds=%d TdAddr0=%#010x - rc=%Rrc\n",
          pUrb, cbTotal, EdAddr, cTds, TdAddr, rc));
-    for (struct OHCITDENTRY *pCur = &Head; pCur; pCur = pCur->pNext, iTd++)
-        ohciR3InFlightRemove(pThis, pCur->TdAddr);
+    ohciR3InFlightRemoveUrb(pThis, pUrb);
     VUSBIRhFreeUrb(pThis->RootHub.pIRhConn, pUrb);
     return false;
@@ -3448 +3449 @@
      * Submit the URB.
      */
-    ohciR3InFlightAddUrb(pThis, pUrb);
+    ohciR3InFlightAdd(pThis, ITdAddr, pUrb);
     Log(("%s: ohciR3ServiceIsochronousTd: submitting cbData=%#x cIsocPkts=%d EdAddr=%#010x TdAddr=%#010x SF=%#x (%#x)\n",
          pUrb->pszDesc, pUrb->cbData, pUrb->cIsocPkts, EdAddr, ITdAddr, pITd->HwInfo & ITD_HWINFO_SF, pThis->HcFmNumber));
@@ -3640 +3641 @@
     {
         OHCIED Ed;
+
+        /* Bail if previous processing ended up in the unrecoverable error state. */
+        if (pThis->intr_status & OHCI_INTR_UNRECOVERABLE_ERROR)
+            break;
+
         ohciR3ReadEd(pThis, EdAddr, &Ed);
         Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
@@ -3781 +3787 @@
     {
         OHCIED Ed;
+
+        /* Bail if previous processing ended up in the unrecoverable error state. */
+        if (pThis->intr_status & OHCI_INTR_UNRECOVERABLE_ERROR)
+            break;
+
         ohciR3ReadEd(pThis, EdAddr, &Ed);
         Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
@@ -3852 +3863 @@
     {
         OHCIED Ed;
+
+        /* Bail if previous processing ended up in the unrecoverable error state. */
+        if (pThis->intr_status & OHCI_INTR_UNRECOVERABLE_ERROR)
+            break;
 
         ohciR3ReadEd(pThis, EdAddr, &Ed);