Changeset 32052 in vbox for trunk/src

Timestamp:

Aug 27, 2010 2:03:57 PM (14 years ago)

Author:

vboxsync

Message:

OHCI: If the bulk list disabled, undo (abort) outstanding bulk transfers.

File:

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

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

@@ -346 +346 @@
     /** Idle detection flag; must be cleared at start of frame */
     bool                fIdle;
-
-    uint32_t            Alignment3;     /**< Align size on a 8 byte boundary. */
+    /** A flag indicating that the bulk list may have in-flight URBs. */
+    bool                fBulkNeedsCleaning;
 } OHCI;
 
@@ -3157 +3157 @@
      */
     pOhci->status &= ~OHCI_STATUS_BLF;
+    pOhci->fBulkNeedsCleaning = false;
     pOhci->bulk_cur = 0;
 
@@ -3168 +3169 @@
         {
             pOhci->status |= OHCI_STATUS_BLF;
+            pOhci->fBulkNeedsCleaning = true;
 
 #if 1
@@ -3232 +3234 @@
 }
 
+/**
+ * Abort outstanding transfers on the bulk list.
+ *
+ * If the guest disabled bulk list processing, we must abort any outstanding transfers
+ * (that is, cancel in-flight URBs associated with the list). This is required because
+ * there may be outstanding read URBs that will never get a response from the device
+ * and would block further communication.
+ */
+static void ohciUndoBulkList(POHCI pOhci)
+{
+#ifdef LOG_ENABLED
+    if (g_fLogBulkEPs)
+        ohciDumpEdList(pOhci, pOhci->bulk_head, "Bulk before", true);
+    if (pOhci->bulk_cur)
+        Log(("ohciUndoBulkList: bulk_cur=%#010x before list processing!!! HCD has positioned us!!!\n", pOhci->bulk_cur));
+#endif
+
+    /* This flag follows OHCI_STATUS_BLF, but BLF doesn't change when list processing is disabled. */
+    pOhci->fBulkNeedsCleaning = false;
+
+    uint32_t EdAddr = pOhci->bulk_head;
+    while (EdAddr)
+    {
+        OHCIED Ed;
+        ohciReadEd(pOhci, EdAddr, &Ed);
+        Assert(!(Ed.hwinfo & ED_HWINFO_ISO)); /* the guest is screwing us */
+        if (ohciIsEdReady(&Ed))
+        {
+            uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
+            if (ohciIsTdInFlight(pOhci, TdAddr))
+            {
+                LogFlow(("ohciUndoBulkList: Ed=%#010RX32 Ed.TailP=%#010RX32 UNDO\n", EdAddr, Ed.TailP));
+                PVUSBURB pUrb = ohciTdInFlightUrb(pOhci, TdAddr);
+                if (pUrb)
+                    pOhci->RootHub.pIRhConn->pfnCancelUrbsEp(pOhci->RootHub.pIRhConn, pUrb);
+            }
+        }
+        /* next endpoint */
+        EdAddr = Ed.NextED & ED_PTR_MASK;
+    }
+}
+
 
 /**
@@ -3511 +3555 @@
         &&  (pOhci->status & OHCI_STATUS_BLF))
         ohciServiceBulkList(pOhci);
+    else if ((pOhci->status & OHCI_STATUS_BLF)
+        &&    pOhci->fBulkNeedsCleaning)
+        ohciUndoBulkList(pOhci);    /* If list disabled but not empty, abort endpoints. */
 
 #if 1