Ticket #7449: ehci.5.patch

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

@@ -381 +381 @@
 
     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));
+    // frameListSizes defined by values between 00b and 10b. 11b is Reserved
+    if (frameListSize > 2) {
+        TRACE_ERROR("unsupported frame list size (%lu)\n", frameListSize);
+        return B_ERROR;
+    }
 
+    uint32 opRegInput = ReadOpReg(EHCI_USBCMD);
+    opRegInput = opRegInput & ~(EHCI_USBCMD_ITC_MASK << EHCI_USBCMD_ITC_SHIFT);
+    opRegInput = opRegInput | EHCI_USBCMD_RUNSTOP
+            | EHCI_USBCMD_ASENABLE | EHCI_USBCMD_PSENABLE
+            | (frameListSize << EHCI_USBCMD_FLS_SHIFT)
+            | (1 << EHCI_USBCMD_ITC_SHIFT);
+
+    bool asyncParkCapable = (ReadCapReg32(EHCI_HCCPARAMS) 
+        & EHCI_HCCPARAMS_ASPM_MASK) != 0;
+    if (asyncParkCapable) {
+        opRegInput = opRegInput
+            & ~(EHCI_USBCMD_ASPMC_MASK << EHCI_USBCMD_ASPMC_SHIFT);
+        opRegInput = opRegInput | EHCI_USBCMD_ASPME 
+            | (0x03 << EHCI_USBCMD_ASPMC_SHIFT);
+    } 
+
+    WriteOpReg(EHCI_USBCMD, opRegInput);
+
     bool running = false;
     for (int32 i = 0; i < 10; i++) {
         uint32 status = ReadOpReg(EHCI_USBSTS);
@@ -400 +419 @@
     }
 
     if (!running) {
-        TRACE("host controller didn't start\n");
+        TRACE_ERROR("host controller didn't start\n");
         return B_ERROR;
     }
 

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