Changeset 104276 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Apr 10, 2024 1:29:23 PM (8 months ago)

Author:

vboxsync

Message:

DevOHCI: Reworked endpoint skipping to use the new cancel by address/endpoint/direction callback (see bugref:10634).

File:

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

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

@@ -693 +693 @@
 /** RD  - Resume detect. */
 #define OHCI_INTR_RESUME_DETECT             RT_BIT(3)
-/** UE  - Unrecoverable error. */
+/** UE  - ",erable error. */
 #define OHCI_INTR_UNRECOVERABLE_ERROR       RT_BIT(4)
 /** FNO - Frame number overflow. */
@@ -2028 +2028 @@
 }
 
+#if 0
 /**
  * Returns a URB associated with an in-flight TD, if any.
@@ -2045 +2046 @@
     return NULL;
 }
+#endif
 
 /**
@@ -3078 +3080 @@
     ohciR3Unlock(pThisCC);
     return fRetire;
+}
+
+
+/**
+ * Determine transfer direction from an endpoint descriptor.
+ * NB: This may fail if the direction is not valid. If it does fail,
+ * we do not raise an unrecoverable error but the caller may wish to.
+ */
+static bool ohciR3GetDirection(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, PCOHCIED pEd, VUSBDIRECTION *pEnmDir)
+{
+    RT_NOREF(pThisCC);
+    RT_NOREF(pThis);
+    VUSBDIRECTION   enmDir = VUSBDIRECTION_INVALID;
+
+    if (pEd->hwinfo & ED_HWINFO_ISO)
+    {
+        switch (pEd->hwinfo & ED_HWINFO_DIR)
+        {
+            case ED_HWINFO_OUT: enmDir = VUSBDIRECTION_OUT; break;
+            case ED_HWINFO_IN:  enmDir = VUSBDIRECTION_IN;  break;
+            default:
+                Log(("ohciR3GetDirection: Invalid direction!!!! Ed.hwinfo=%#x\n", pEd->hwinfo));
+                *pEnmDir = VUSBDIRECTION_INVALID;
+                return false;
+        }
+    }
+    else
+    {
+        switch (pEd->hwinfo & ED_HWINFO_DIR)
+        {
+            case ED_HWINFO_OUT: enmDir = VUSBDIRECTION_OUT; break;
+            case ED_HWINFO_IN:  enmDir = VUSBDIRECTION_IN;  break;
+            default:
+                /* We must read the TD to determine direction. */
+                uint32_t    TdAddr = pEd->HeadP & ED_PTR_MASK;
+                OHCITD      Td;
+                ohciR3ReadTd(pDevIns, TdAddr, &Td);
+                switch (Td.hwinfo & TD_HWINFO_DIR)
+                {
+                    case TD_HWINFO_OUT: enmDir = VUSBDIRECTION_OUT; break;
+                    case TD_HWINFO_IN:  enmDir = VUSBDIRECTION_IN; break;
+                    case 0:             enmDir = VUSBDIRECTION_SETUP; break;
+                    default:
+                        Log(("ohciR3GetDirection: Invalid direction!!!! Td.hwinfo=%#x Ed.hwinfo=%#x\n", Td.hwinfo, pEd->hwinfo));
+                        *pEnmDir = VUSBDIRECTION_INVALID;
+                        return false;
+                }
+        }
+   }
+
+    *pEnmDir = enmDir;
+    return true;
 }
 
@@ -3834 +3888 @@
                  * cancel outstanding URBs, if any.
                  */
-                uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
-                if (pUrb)
-                    pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
+                uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
+                uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
+                VUSBDIRECTION enmDir;
+                if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+                {
+                    pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);
+                }
             }
         }
@@ -3890 +3947 @@
             {
                 LogFlow(("ohciR3UndoBulkList: Ed=%#010RX32 Ed.TailP=%#010RX32 UNDO\n", EdAddr, Ed.TailP));
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
-                if (pUrb)
-                    pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
+               /* First we need to determine the transfer direction, which may fail(!). */
+               uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
+               uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
+               VUSBDIRECTION enmDir;
+               if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+               {
+                   pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);
+               }
             }
         }
@@ -4054 +4116 @@
                 /* If the ED is in 'skip' state, no transactions on it are allowed and we must
                  * cancel outstanding URBs, if any.
+                 * First we need to determine the transfer direction, which may fail(!).
                  */
-                uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
-                if (pUrb)
-                    pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
+                uint8_t uAddr  = Ed.hwinfo & ED_HWINFO_FUNCTION;
+                uint8_t uEndPt = (Ed.hwinfo & ED_HWINFO_ENDPOINT) >> ED_HWINFO_ENDPOINT_SHIFT;
+                VUSBDIRECTION enmDir;
+                if (ohciR3GetDirection(pDevIns, pThis, pThisCC, &Ed, &enmDir))
+                {
+                    pThisCC->RootHub.pIRhConn->pfnAbortEpByAddr(pThisCC->RootHub.pIRhConn, uAddr, uEndPt, enmDir);
+                }
             }
         }