Changeset 78528 in vbox

Timestamp:

May 15, 2019 8:31:09 AM (6 years ago)

Author:

vboxsync

Message:

OHCI: Identify where unrecoverable error is coming from.

File:

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

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

@@ -913 +913 @@
  * @returns nothing.
  * @param   pThis               The OHCI instance.
- */
-DECLINLINE(void) ohciR3RaiseUnrecoverableError(POHCI pThis)
-{
-    LogRelMax(10, ("OHCI#%d: Raising unrecoverable error\n", pThis->pDevInsR3->iInstance));
+ * @param   iCode               Diagnostic code.
+ */
+DECLINLINE(void) ohciR3RaiseUnrecoverableError(POHCI pThis, int iCode)
+{
+    LogRelMax(10, ("OHCI#%d: Raising unrecoverable error (%d)\n", pThis->pDevInsR3->iInstance, iCode));
     ohciR3SetInterrupt(pThis, OHCI_INTR_UNRECOVERABLE_ERROR);
 }
@@ -2681 +2682 @@
         if (!ohciR3BufInit(&Buf, pTd->cbp, pTd->be))
         {
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 1);
             return;
         }
@@ -2712 +2713 @@
                     && Buf.aVecs[1].cb > (cbLeft - Buf.aVecs[0].cb)))
             {
-                ohciR3RaiseUnrecoverableError(pThis);
+                ohciR3RaiseUnrecoverableError(pThis, 2);
                 return;
             }
@@ -2976 +2977 @@
     if (!ohciR3BufInit(&Buf, Td.cbp, Td.be))
     {
-        ohciR3RaiseUnrecoverableError(pThis);
+        ohciR3RaiseUnrecoverableError(pThis, 3);
         return false;
     }
@@ -2998 +2999 @@
                 default:
                     Log(("ohciR3ServiceTd: Invalid direction!!!! Td.hwinfo=%#x Ed.hwdinfo=%#x\n", Td.hwinfo, pEd->hwinfo));
-                    ohciR3RaiseUnrecoverableError(pThis);
+                    ohciR3RaiseUnrecoverableError(pThis, 4);
                     return false;
             }
@@ -3036 +3037 @@
                 && Buf.aVecs[1].cb > (pUrb->cbData - Buf.aVecs[0].cb)))
         {
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 5);
             VUSBIRhFreeUrb(pThis->RootHub.pIRhConn, pUrb);
             return false;
@@ -3117 +3118 @@
     if (!ohciR3BufInit(&Head.Buf, Head.Td.cbp, Head.Td.be))
     {
-        ohciR3RaiseUnrecoverableError(pThis);
+        ohciR3RaiseUnrecoverableError(pThis, 6);
         return false;
     }
@@ -3139 +3140 @@
         if (!ohciR3BufInit(&pCur->Buf, pCur->Td.cbp, pCur->Td.be))
         {
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 7);
             return false;
         }
@@ -3175 +3176 @@
                 default:
                     Log(("ohciR3ServiceTdMultiple: Invalid direction!!!! Head.Td.hwinfo=%#x Ed.hwdinfo=%#x\n", Head.Td.hwinfo, pEd->hwinfo));
-                    ohciR3RaiseUnrecoverableError(pThis);
+                    ohciR3RaiseUnrecoverableError(pThis, 8);
                     return false;
             }
@@ -3354 +3355 @@
         default:
             Log(("ohciR3ServiceIsochronousTd: Invalid direction!!!! Ed.hwdinfo=%#x\n", pEd->hwinfo));
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 9);
             return false;
     }
@@ -3387 +3388 @@
         {
             Log(("ITdAddr=%RX32 PSW%d.offset=%#x < offPrev=%#x!\n", ITdAddr, iR, off, offPrev)); /* => Unrecoverable Error*/
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 10);
             return false;
         }
@@ -3393 +3394 @@
         {
             Log(("ITdAddr=%RX32 PSW%d.CC=%#x < 'Not Accessed'!\n", ITdAddr, iR, PSW >> ITD_PSW_CC_SHIFT)); /* => Unrecoverable Error*/
-            ohciR3RaiseUnrecoverableError(pThis);
+            ohciR3RaiseUnrecoverableError(pThis, 11);
             return false;
         }
@@ -3406 +3407 @@
     {
         Log(("ITdAddr=%RX32 offEnd=%#x < offPrev=%#x!\n", ITdAddr, offEnd, offPrev)); /* => Unrecoverable Error*/
-        ohciR3RaiseUnrecoverableError(pThis);
+        ohciR3RaiseUnrecoverableError(pThis, 12);
         return false;
     }