Ticket #7449: ehci.2.patch

home/gabe/haiku/haiku/src/add-ons/kernel/busses/usb/ehci.cpp

@@ -379 +379 @@
     TRACE("starting EHCI host controller\n");
     TRACE("usbcmd: 0x%08lx; usbsts: 0x%08lx\n", ReadOpReg(EHCI_USBCMD), ReadOpReg(EHCI_USBSTS));
 
+    bool running = false;
+
     uint32 frameListSize = (ReadOpReg(EHCI_USBCMD) >> EHCI_USBCMD_FLS_SHIFT)
         & EHCI_USBCMD_FLS_MASK;
-    WriteOpReg(EHCI_USBCMD, ReadOpReg(EHCI_USBCMD) | EHCI_USBCMD_RUNSTOP
-        | EHCI_USBCMD_ASENABLE | EHCI_USBCMD_PSENABLE
-        | (frameListSize << EHCI_USBCMD_FLS_SHIFT)
-        | (1 << EHCI_USBCMD_ITC_SHIFT));
 
-    bool running = false;
-    for (int32 i = 0; i < 10; i++) {
-        uint32 status = ReadOpReg(EHCI_USBSTS);
-        TRACE("try %ld: status 0x%08lx\n", i, status);
+    uint32 asyncParkCapable = ReadCapReg32(EHCI_HCCPARAMS) 
+        & EHCI_HCCPARAMS_ASPM_MASK;
 
-        if (status & EHCI_USBSTS_HCHALTED) {
-            snooze(10000);
-        } else {
-            running = true;
-            break;
+    uint32 opRegInput = ReadOpReg(EHCI_USBCMD); 
+
+    // frameListSizes defined by values between 00b and 10b. 11b is Reserved
+    if (frameListSize < 3) {
+        opRegInput = opRegInput | EHCI_USBCMD_RUNSTOP
+                | EHCI_USBCMD_ASENABLE | EHCI_USBCMD_PSENABLE
+                | (frameListSize << EHCI_USBCMD_FLS_SHIFT)
+                | (1 << EHCI_USBCMD_ITC_SHIFT);
+
+        if (asyncParkCapable) {
+            opRegInput = opRegInput | EHCI_USBCMD_ASPME 
+                | (0x03 << EHCI_USBCMD_ASPMC_SHIFT);
+            opRegInput = opRegInput & EHCI_USBCMD_ASPMC_MASK;
+        } 
+
+        opRegInput = opRegInput & EHCI_USBCMD_ITC_MASK;
+        WriteOpReg(EHCI_USBCMD, opRegInput);
+
+        for (int32 i = 0; i < 10; i++) {
+            uint32 status = ReadOpReg(EHCI_USBSTS);
+            TRACE("try %ld: status 0x%08lx\n", i, status);
+
+            if (status & EHCI_USBSTS_HCHALTED) {
+                snooze(10000);
+            } else {
+                running = true;
+                break;
+            }
         }
     }
 
@@ -404 +423 @@
         return B_ERROR;
     }
 
+
     // route all ports to us
     WriteOpReg(EHCI_CONFIGFLAG, EHCI_CONFIGFLAG_FLAG);
     snooze(10000);

home/gabe/haiku/haiku/src/add-ons/kernel/busses/usb/ehci_hardware.h

@@ -14 +14 @@
 #define EHCI_HCIVERSION         0x02        // Interface Version Number
 #define EHCI_HCSPARAMS          0x04        // Structural Parameters
 #define EHCI_HCCPARAMS          0x08        // Capability Parameters
+#define EHCI_HCCPARAMS_ASPM_MASK    0x04        // Asynchronous Schedule Park Mode
 #define EHCI_HCSP_PORTROUTE     0x0c        // Companion Port Route Description