Ticket #8085: usbOHCIStartupV2.diff

src/add-ons/kernel/busses/usb/ohci.cpp

@@ -204 +204 @@
     fInterruptEndpoints[0]->next_physical_endpoint
         = fDummyIsochronous->physical_address;
 
-    // Disable all interrupts before handoff/reset
-    _WriteReg(OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTERRUPTS);
-
     // Determine in what context we are running (Kindly copied from FreeBSD)
     uint32 control = _ReadReg(OHCI_CONTROL);
-    if (control & OHCI_INTERRUPT_ROUTING) {
+    if ((control & OHCI_INTERRUPT_ROUTING) != 0) {
+        // SMM in control, ask for control of USB
         TRACE_ALWAYS("smm is in control of the host controller\n");
         uint32 status = _ReadReg(OHCI_COMMAND_STATUS);
         _WriteReg(OHCI_COMMAND_STATUS, status | OHCI_OWNERSHIP_CHANGE_REQUEST);
@@ -218 +216 @@
             control = _ReadReg(OHCI_CONTROL);
         }
 
+        // Disable all interrupts to prevent interrupt storm
+        _WriteReg(OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTERRUPTS);
+
         if ((control & OHCI_INTERRUPT_ROUTING) != 0) {
-            TRACE_ERROR("smm does not respond. resetting...\n");
+            TRACE_ERROR("smm is not responding. Resetting...\n");
+            // Last resort
             _WriteReg(OHCI_CONTROL, OHCI_HC_FUNCTIONAL_STATE_RESET);
             snooze(USB_DELAY_BUS_RESET);
-        } else
+        } else {
             TRACE_ALWAYS("ownership change successful\n");
+        }
     } else {
-        TRACE("cold started\n");
-        snooze(USB_DELAY_BUS_RESET);
+        // SMM *not* in control, resume or reset USB bus
+
+        // Disable all interrupts to prevent interrupt storm
+        _WriteReg(OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTERRUPTS);
+
+        control = _ReadReg(OHCI_CONTROL) & OHCI_HC_FUNCTIONAL_STATE_MASK;
+        if ((control & OHCI_HC_FUNCTIONAL_STATE_RESET) == 0) {
+            TRACE("no smm, BIOS active. Attempting resume...\n");
+            if ((control & OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL) == 0) {
+                _WriteReg(OHCI_CONTROL, OHCI_HC_FUNCTIONAL_STATE_RESUME);
+                for (uint32 i = 0; i < 100
+                    && !(control & OHCI_HC_FUNCTIONAL_STATE_RESUME); i++) {
+                    snooze(1000);
+                    control = _ReadReg(OHCI_CONTROL)
+                        & OHCI_HC_FUNCTIONAL_STATE_MASK;
+                }
+                if ((control & OHCI_HC_FUNCTIONAL_STATE_RESUME) == 0)
+                    TRACE_ALWAYS("failed to resume controller\n");
+            } else {
+                TRACE_ALWAYS("bus not reset, and not operational?\n");
+            }
+        } else {
+            TRACE("no smm, no BIOS. Attempting reset...\n");
+
+            _WriteReg(OHCI_CONTROL, OHCI_HC_FUNCTIONAL_STATE_RESET);
+            snooze(USB_DELAY_BUS_RESET);
+            for (uint32 i = 0; i < 100
+                && !(control & OHCI_HC_FUNCTIONAL_STATE_RESET); i++) {
+                snooze(1000);
+                control = _ReadReg(OHCI_CONTROL)
+                    & OHCI_HC_FUNCTIONAL_STATE_MASK;
+            }
+            if ((control & OHCI_HC_FUNCTIONAL_STATE_RESET) == 0)
+                TRACE_ALWAYS("failed to reset controller\n");
+        }
     }
 
+    #if 0
     // This reset should not be necessary according to the OHCI spec, but
     // without it some controllers do not start.
     _WriteReg(OHCI_CONTROL, OHCI_HC_FUNCTIONAL_STATE_RESET);
     snooze(USB_DELAY_BUS_RESET);
+    #endif
 
     // We now own the host controller and the bus has been reset
     uint32 frameInterval = _ReadReg(OHCI_FRAME_INTERVAL);