Changeset 05770666 in mainline

Timestamp:

2018-01-18T14:40:20Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e7f21884

Parents:

2c0564c

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-18 14:30:02)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-18 14:40:20)

Message:

xhci rh: try to detect hidden connected devices at startup

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• rh.c (modified) (3 diffs)
• rh.h (modified) (1 diff)

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

@@ -504 +504 @@
         XHCI_REG_SET(hc->op_regs, XHCI_OP_RS, 1);
 
-        /* The reset changed status of all ports, and SW originated reason does
-         * not cause an interrupt.
-         */
-        for (uint8_t port = 1; port <= hc->rh.max_ports; ++port)
-                xhci_rh_handle_port_change(&hc->rh, port);
+        xhci_rh_startup(&hc->rh);
 
         return EOK;

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

@@ -224 +224 @@
                         status &= ~XHCI_REG_MASK(XHCI_PORT_CSC);
 
-                        bool connected = !!(status & XHCI_REG_MASK(XHCI_PORT_CCS));
+                        const bool connected = !!(status & XHCI_REG_MASK(XHCI_PORT_CCS));
                         if (connected) {
                                 usb_port_connected(&port->base, &rh_enumerate_device);
@@ -234 +234 @@
                 if (status & XHCI_REG_MASK(XHCI_PORT_PRC)) {
                         status &= ~XHCI_REG_MASK(XHCI_PORT_PRC);
-                        bool enabled = !!(status & XHCI_REG_MASK(XHCI_PORT_PED));
-
+
+                        const bool enabled = !!(status & XHCI_REG_MASK(XHCI_PORT_PED));
                         if (enabled) {
                                 usb_port_enabled(&port->base);
@@ -258 +258 @@
 }
 
+void xhci_rh_startup(xhci_rh_t *rh)
+{
+        /* The reset changed status of all ports, and SW originated reason does
+         * not cause an interrupt.
+         */
+        for (uint8_t i = 1; i < rh->max_ports; ++i) {
+                xhci_rh_handle_port_change(rh, i + 1);
+
+                rh_port_t * const port = &rh->ports[i];
+
+                /*
+                 * When xHCI starts, for some reasons USB 3 ports do not have
+                 * the CSC bit, even though they are connected. Try to find
+                 * such ports.
+                 */
+                if (XHCI_REG_RD(port->regs, XHCI_PORT_CCS) && port->base.state == PORT_DISABLED)
+                        usb_port_connected(&port->base, &rh_enumerate_device);
+        }
+}
+
 /**
  * @}

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

@@ -80 +80 @@
 void xhci_rh_handle_port_change(xhci_rh_t *, uint8_t);
 void xhci_rh_set_ports_protocol(xhci_rh_t *, unsigned, unsigned, unsigned);
+void xhci_rh_startup(xhci_rh_t *);
 
 #endif