Changeset 87971 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 5, 2021 2:31:15 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143079

Message:

OHCI: Clear list enable bits on reset in order to get out of work loops faster.

File:

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

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

@@ -1243 +1243 @@
     Log(("ohci: %s reset%s\n", fNewMode == OHCI_USB_RESET ? "hardware" : "software",
          fResetOnLinux ? " (reset on linux)" : ""));
+
+    /* Clear list enable bits first, so that any processing currently in progress terminates quickly. */
+    pThis->ctl &= ~(OHCI_CTL_BLE | OHCI_CTL_CLE | OHCI_CTL_PLE);
 
     /* Stop the bus in any case, disabling walking the lists. */
@@ -3730 +3733 @@
 
     uint32_t EdAddr = pThis->bulk_head;
-    while (EdAddr)
+    while (EdAddr && (pThis->ctl & OHCI_CTL_BLE))
     {
         OHCIED Ed;
@@ -3797 +3800 @@
         }
 
-        /* next end point */
+        /* Trivial loop detection. */
+        if (EdAddr == (Ed.NextED & ED_PTR_MASK))
+            break;
+        /* Proceed to the next endpoint. */
         EdAddr = Ed.NextED & ED_PTR_MASK;
-
     }
 
@@ -3847 +3852 @@
             }
         }
-        /* next endpoint */
+
+        /* Trivial loop detection. */
+        if (EdAddr == (Ed.NextED & ED_PTR_MASK))
+            break;
+        /* Proceed to the next endpoint. */
         EdAddr = Ed.NextED & ED_PTR_MASK;
     }
@@ -3877 +3886 @@
 
     uint32_t EdAddr = pThis->ctrl_head;
-    while (EdAddr)
+    while (EdAddr && (pThis->ctl & OHCI_CTL_CLE))
     {
         OHCIED Ed;
@@ -3913 +3922 @@
         }
 
-        /* next end point */
+        /* Trivial loop detection. */
+        if (EdAddr == (Ed.NextED & ED_PTR_MASK))
+            break;
+        /* Proceed to the next endpoint. */
         EdAddr = Ed.NextED & ED_PTR_MASK;
     }
@@ -3953 +3965 @@
      * Iterate the endpoint list.
      */
-    while (EdAddr)
+    while (EdAddr && (pThis->ctl & OHCI_CTL_PLE))
     {
         OHCIED Ed;
@@ -4000 +4012 @@
             }
         }
-        /* next end point */
+        /* Trivial loop detection. */
+        if (EdAddr == (Ed.NextED & ED_PTR_MASK))
+            break;
+        /* Proceed to the next endpoint. */
         EdAddr = Ed.NextED & ED_PTR_MASK;
     }
@@ -4159 +4174 @@
                 } while (TdAddr != (Ed.TailP & ED_PTR_MASK));
             }
+            /* Trivial loop detection. */
+            if (EdAddr == (Ed.NextED & ED_PTR_MASK))
+                break;
+            /* Proceed to the next endpoint. */
             EdAddr = Ed.NextED & ED_PTR_MASK;
         }