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

Timestamp:

Oct 14, 2021 6:41:12 PM (3 years ago)

Author:

vboxsync

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

147477

Message:

OHCI: Straightened out ED/TD iteration limits (see bugref:10103).

File:

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

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

@@ -1779 +1779 @@
 {
     uint32_t GCPhys = GCPhysHead;
-    int cMax = 100;
+    int cIterations = 128;
     for (;;)
     {
@@ -1806 +1806 @@
         GCPhys = Td.NextTD & ED_PTR_MASK;
         Assert(GCPhys != GCPhysHead);
-        Assert(cMax-- > 0); NOREF(cMax);
+        if (!--cIterations)
+            break;
     }
 }
@@ -1828 +1829 @@
     RT_NOREF(fFull);
     uint32_t GCPhys = GCPhysHead;
-    int cMax = 100;
+    int cIterations = 100;
     for (;;)
     {
@@ -1855 +1856 @@
         GCPhys = ITd.NextTD & ED_PTR_MASK;
         Assert(GCPhys != GCPhysHead);
-        Assert(cMax-- > 0); NOREF(cMax);
+        if (!--cIterations)
+            break;
     }
 }
@@ -2247 +2249 @@
     AssertMsgReturn(LastTdAddr != TdAddr, ("TdAddr=%#010RX32\n", TdAddr), false);
 
-    uint32_t cMax = 256;
+    uint32_t cIterations = 256;
     uint32_t CurTdAddr = pEd->HeadP & ED_PTR_MASK;
     while (     CurTdAddr != LastTdAddr
-           &&   cMax-- > 0)
+           &&   cIterations-- > 0)
     {
         OHCIITD ITd;
@@ -2266 +2268 @@
     }
 
-    Log(("ohciUnlinkIsocTdInList: TdAddr=%#010RX32 wasn't found in the list!!! (cMax=%d)\n", TdAddr, cMax));
+    Log(("ohciUnlinkIsocTdInList: TdAddr=%#010RX32 wasn't found in the list!!! (cIterations=%d)\n", TdAddr, cIterations));
     return false;
 }
@@ -2279 +2281 @@
     AssertMsgReturn(LastTdAddr != TdAddr, ("TdAddr=%#010RX32\n", TdAddr), false);
 
-    uint32_t cMax = 256;
+    uint32_t cIterations = 256;
     uint32_t CurTdAddr = pEd->HeadP & ED_PTR_MASK;
     while (     CurTdAddr != LastTdAddr
-           &&   cMax-- > 0)
+           &&   cIterations-- > 0)
     {
         OHCITD Td;
@@ -2298 +2300 @@
     }
 
-    Log(("ohciR3UnlinkGeneralTdInList: TdAddr=%#010RX32 wasn't found in the list!!! (cMax=%d)\n", TdAddr, cMax));
+    Log(("ohciR3UnlinkGeneralTdInList: TdAddr=%#010RX32 wasn't found in the list!!! (cIterations=%d)\n", TdAddr, cIterations));
     return false;
 }
@@ -3739 +3741 @@
 
     uint32_t EdAddr = pThis->bulk_head;
-    while (EdAddr && (pThis->ctl & OHCI_CTL_BLE))
+    uint32_t cIterations = 256;
+    while (EdAddr
+        && (pThis->ctl & OHCI_CTL_BLE)
+        && (cIterations-- > 0))
     {
         OHCIED Ed;
@@ -3841 +3846 @@
 
     uint32_t EdAddr = pThis->bulk_head;
-    while (EdAddr)
+    uint32_t cIterations = 256;
+    while (EdAddr
+        && (cIterations-- > 0))
     {
         OHCIED Ed;
@@ -3892 +3899 @@
 
     uint32_t EdAddr = pThis->ctrl_head;
-    while (EdAddr && (pThis->ctl & OHCI_CTL_CLE))
+    uint32_t cIterations = 256;
+    while ( EdAddr
+        && (pThis->ctl & OHCI_CTL_CLE)
+        && (cIterations-- > 0))
     {
         OHCIED Ed;
@@ -3971 +3981 @@
      * Iterate the endpoint list.
      */
-    while (EdAddr && (pThis->ctl & OHCI_CTL_PLE))
+    unsigned cIterations = 128;
+    while (EdAddr
+        && (pThis->ctl & OHCI_CTL_PLE)
+        && (cIterations-- > 0))
     {
         OHCIED Ed;
@@ -4144 +4157 @@
             break;
         }
-        while (EdAddr)
+
+        unsigned cIterED = 128;
+        while ( EdAddr
+            && (cIterED-- > 0))
         {
             OHCIED Ed;
@@ -4152 +4168 @@
             uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
             uint32_t TailP  = Ed.TailP & ED_PTR_MASK;
-            unsigned k = 0;
+            unsigned cIterTD = 0;
             if (  !(Ed.hwinfo & ED_HWINFO_SKIP)
                 && (TdAddr != TailP))
@@ -4176 +4192 @@
                         break;
                     /* Failsafe for temporarily looped lists. */
-                    if (++k == 128)
+                    if (++cIterTD == 128)
                         break;
                 } while (TdAddr != (Ed.TailP & ED_PTR_MASK));