Changeset 58f4c0f in mainline

Timestamp:

2018-01-20T21:38:48Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

d648e83

Parents:

cb63854

Message:

xhci: reset also USB 3 ports

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (4 diffs)

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

@@ -62 +62 @@
         XHCI_REG_MASK(XHCI_PORT_CEC);
 
+static const uint32_t port_reset_mask =
+        XHCI_REG_MASK(XHCI_PORT_WRC) |
+        XHCI_REG_MASK(XHCI_PORT_PRC);
+
 typedef struct rh_port {
         usb_port_t base;
@@ -133 +137 @@
                 if ((err = usb_port_wait_for_enabled(&port->base)))
                         return err;
+        } else {
+                /* Do the Warm reset to ensure the state is clear. */
+                XHCI_REG_SET(port->regs, XHCI_PORT_WPR, 1);
+                if ((err = usb_port_wait_for_enabled(&port->base)))
+                        return err;
         }
 
@@ -220 +229 @@
                 XHCI_REG_WR_FIELD(&port->regs->portsc, status & ~XHCI_REG_MASK(XHCI_PORT_PED), 32);
 
+                const bool connected = !!(status & XHCI_REG_MASK(XHCI_PORT_CCS));
+                const bool enabled = !!(status & XHCI_REG_MASK(XHCI_PORT_PED));
+
                 if (status & XHCI_REG_MASK(XHCI_PORT_CSC)) {
                         usb_log_info("Connected state changed on port %u.", port_id);
                         status &= ~XHCI_REG_MASK(XHCI_PORT_CSC);
 
-                        const bool connected = !!(status & XHCI_REG_MASK(XHCI_PORT_CCS));
                         if (connected) {
                                 usb_port_connected(&port->base, &rh_enumerate_device);
@@ -232 +243 @@
                 }
 
-                if (status & XHCI_REG_MASK(XHCI_PORT_PRC)) {
-                        status &= ~XHCI_REG_MASK(XHCI_PORT_PRC);
-
-                        const bool enabled = !!(status & XHCI_REG_MASK(XHCI_PORT_PED));
+                if (status & port_reset_mask) {
+                        status &= ~port_reset_mask;
+
                         if (enabled) {
                                 usb_port_enabled(&port->base);