Changeset 31230 in vbox

Timestamp:

Jul 30, 2010 7:29:31 AM (14 years ago)

Author:

vboxsync

Message:

OHCI/VUSB: Propagate transfer cancellation from the guest to avoid stuck URBs.

Location:

trunk

Files:

trunk/include/VBox/vusb.h

-              r30788
+              r31230
      */
     DECLR3CALLBACKMEMBER(void, pfnReapAsyncUrbs,(PVUSBIROOTHUBCONNECTOR pInterface, RTMSINTERVAL cMillies));
+    /**
+     * Cancels and completes - with CRC failure - all URBs queued on an endpoint.
+     * This is done in response to guest URB cancellation.
+     *
+     * @returns VBox status code.
+     * @param   pInterface  Pointer to this struct.
+     * @param   pUrb        Pointer to a previously submitted URB.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnCancelUrbsEp,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb));
     /**

-              r30568
+              r31230
+}
+/**
+ * Returns a URB associated with an in-flight TD, if any.
+ *
+ * @returns pointer to URB if TD is in flight.
+ * @returns NULL if not in flight.
+ * @param   pOhci       OHCI instance data.
+ * @param   GCPhysTD    Physical address of the TD.
+ */
+static PVUSBURB ohciTdInFlightUrb(POHCI pOhci, uint32_t GCPhysTD)
+{
+    int i;
+    i = ohci_in_flight_find(pOhci, GCPhysTD);
+    if ( i >= 0 )
+        return pOhci->aInFlight[i].pUrb;
+    else
+        return NULL;
+}
 /**
 …
+            }
 #endif
+        }
+        else
+        {
+            if (Ed.hwinfo & ED_HWINFO_SKIP)
+            {
+                LogFlow(("ohciServiceBulkList: Ed=%#010RX32 Ed.TailP=%#010RX32 SKIP\n", EdAddr, Ed.TailP));
+                /* If the ED is in 'skip' state, no transactions on it are allowed and we must
+                 * cancel outstanding URBs, if any.
+                 */
+                uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
+                PVUSBURB pUrb = ohciTdInFlightUrb(pOhci, TdAddr);
+                if (pUrb)
+                    pOhci->RootHub.pIRhConn->pfnCancelUrbsEp(pOhci->RootHub.pIRhConn, pUrb);
+            }
+        }

-              r30528
+              r31230
+/** @copydoc VUSBIROOTHUBCONNECTOR::pfnCancelUrbsEp */
+static DECLCALLBACK(int) vusbRhCancelUrbsEp(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb)
+{
+    PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
+    AssertReturn(pRh, VERR_INVALID_PARAMETER);
+    AssertReturn(pUrb, VERR_INVALID_PARAMETER);
+    //@todo: This method of URB canceling may not work on non-Linux hosts.
+    /*
+     * Cancel and reap the URB(s) on an endpoint.
+     */
+    LogFlow(("vusbRhCancelUrbsEp: pRh=%p pUrb=%p\n", pRh));
+    vusbUrbCancel(pUrb);
+    PVUSBURB pRipe;
+    if (pUrb->enmState == VUSBURBSTATE_REAPED)
+        pRipe = pUrb;
+    else
+        pRipe = pUrb->pUsbIns->pReg->pfnUrbReap(pUrb->pUsbIns, 0);
+    if (pRipe)
+    {
+        pRipe->enmStatus = VUSBSTATUS_CRC;
+        vusbUrbRipe(pRipe);
+    }
+    return VINF_SUCCESS;
+}
 /** @copydoc VUSBIROOTHUBCONNECTOR::pfnCancelAllUrbs */
 static DECLCALLBACK(void) vusbRhCancelAllUrbs(PVUSBIROOTHUBCONNECTOR pInterface)
 …
     pThis->IRhConnector.pfnSubmitUrb    = vusbRhSubmitUrb;
     pThis->IRhConnector.pfnReapAsyncUrbs= vusbRhReapAsyncUrbs;
+    pThis->IRhConnector.pfnCancelUrbsEp = vusbRhCancelUrbsEp;
     pThis->IRhConnector.pfnCancelAllUrbs= vusbRhCancelAllUrbs;
     pThis->IRhConnector.pfnAttachDevice = vusbRhAttachDevice;

Note: See TracChangeset for help on using the changeset viewer.