Changeset 9b56e528 in mainline

Timestamp:

2018-01-13T15:13:44Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

36fb6d7

Parents:

37b13175

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-13 15:11:45)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-13 15:13:44)

Message:

xhci rh: better not disable port on any event

The result of a long debugging is that PED bit is RW1C, which means
that enabled port disables itself when asserting events.

Location:

uspace/drv/bus/usb/xhci

Files:

• debug.c (modified) (1 diff)
• hw_struct/regs.h (modified) (2 diffs)
• rh.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/debug.c

@@ -127 +127 @@
         DUMP_REG(port, XHCI_PORT_DR);
         DUMP_REG(port, XHCI_PORT_WPR);
+        DUMP_REG(port, XHCI_PORT_USB3_U1TO);
+        DUMP_REG(port, XHCI_PORT_USB3_U2TO);
+        DUMP_REG(port, XHCI_PORT_USB3_FLPMA);
+        DUMP_REG(port, XHCI_PORT_USB3_LEC);
+        DUMP_REG(port, XHCI_PORT_USB3_RLC);
+        DUMP_REG(port, XHCI_PORT_USB3_TLC);
+        DUMP_REG(port, XHCI_PORT_USB2_L1S);
+        DUMP_REG(port, XHCI_PORT_USB2_RWE);
+        DUMP_REG(port, XHCI_PORT_USB2_BESL);
+        DUMP_REG(port, XHCI_PORT_USB2_L1DS);
+        DUMP_REG(port, XHCI_PORT_USB2_HLE);
+        DUMP_REG(port, XHCI_PORT_USB2_TM);
+        DUMP_REG(port, XHCI_PORT_USB2_HIRDM);
+        DUMP_REG(port, XHCI_PORT_USB2_L1TO);
+        DUMP_REG(port, XHCI_PORT_USB2_BESLD);
 }
 

uspace/drv/bus/usb/xhci/hw_struct/regs.h

@@ -300 +300 @@
 #define XHCI_PORT_WDE           portsc, 32,  FLAG, 26
 #define XHCI_PORT_WOE           portsc, 32,  FLAG, 27
-#define XHCI_PORT_DR            portsc, 32,  FLAG, 28
-#define XHCI_PORT_WPR           portsc, 32,  FLAG, 29
+#define XHCI_PORT_DR            portsc, 32,  FLAG, 30
+#define XHCI_PORT_WPR           portsc, 32,  FLAG, 31
 
 #define XHCI_PORT_USB3_U1TO   portpmsc, 32, RANGE,  7,  0
@@ -316 +316 @@
 #define XHCI_PORT_USB2_HLE    portpmsc, 32,  FLAG, 16
 #define XHCI_PORT_USB2_TM     portpmsc, 32, RANGE, 31, 28
-#define XHCI_PORT_USB2_HIRDM porthlmpc, 32, RANGE,  1,  0
-#define XHCI_PORT_USB2_L1TO  porthlmpc, 32, RANGE,  9,  2
-#define XHCI_PORT_USB2_BESLD porthlmpc, 32, RANGE, 13, 10
+#define XHCI_PORT_USB2_HIRDM porthlpmc, 32, RANGE,  1,  0
+#define XHCI_PORT_USB2_L1TO  porthlpmc, 32, RANGE,  9,  2
+#define XHCI_PORT_USB2_BESLD porthlpmc, 32, RANGE, 13, 10
 
 /**

uspace/drv/bus/usb/xhci/rh.c

@@ -52 +52 @@
 
 /* This mask only lists registers, which imply port change. */
-static const uint32_t port_change_mask =
+static const uint32_t port_events_mask =
         XHCI_REG_MASK(XHCI_PORT_CSC) |
         XHCI_REG_MASK(XHCI_PORT_PEC) |
@@ -162 +162 @@
         int err;
         assert(rh);
-
         assert(rh->devices_by_port[port_id - 1] == NULL);
+
+        if (!XHCI_REG_RD(&rh->hc->op_regs->portrs[port_id - 1], XHCI_PORT_PED)) {
+                usb_log_error("Cannot setup RH device: port is disabled.");
+                return EIO;
+        }
 
         device_t *dev = hcd_ddf_fun_create(&rh->hc->base);
@@ -322 +326 @@
         xhci_port_regs_t * const regs = &rh->hc->op_regs->portrs[port_id - 1];
 
-        uint32_t events = XHCI_REG_RD_FIELD(&regs->portsc, 32) & port_change_mask;
+        uint32_t events = XHCI_REG_RD_FIELD(&regs->portsc, 32) & port_events_mask;
 
         while (events) {
-                XHCI_REG_SET_FIELD(&regs->portsc, events, 32);
+                /*
+                 * The PED bit in xHCI has RW1C semantics, which means that
+                 * writing 1 to it will disable the port. Which means all
+                 * standard mechanisms of register handling fails here.
+                 */
+                uint32_t portsc = XHCI_REG_RD_FIELD(&regs->portsc, 32);
+                portsc &= ~(port_events_mask | XHCI_REG_MASK(XHCI_PORT_PED)); // Clear events + PED
+                portsc |= events; // Add back events to assert them
+                XHCI_REG_WR_FIELD(&regs->portsc, portsc, 32);
 
                 if (events & XHCI_REG_MASK(XHCI_PORT_CSC)) {
@@ -346 +358 @@
                 
                 /* Make sure that PSCEG is 0 before exiting the loop. */
-                events = XHCI_REG_RD_FIELD(&regs->portsc, 32) & port_change_mask;
+                events = XHCI_REG_RD_FIELD(&regs->portsc, 32) & port_events_mask;
         }