Changeset 816335c in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-04T10:06:10Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c68c713c

Parents:

5c5c9407

Message:

xhci: port speed detected properly

The correct way to determine protocol supported on a port is to look at the Port Speed value in the port register, and use it as an index to the speeds defined in extended capabilities. Now we support non-contiguous ranges of ports, USB 3.1, and the detection would work even for non-USB protocols.

File:

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

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

@@ -51 +51 @@
 static usbvirt_device_ops_t ops;
 
-int xhci_rh_init(xhci_rh_t *rh, xhci_op_regs_t *op_regs)
+int xhci_rh_init(xhci_rh_t *rh, xhci_hc_t *hc)
 {
         assert(rh);
-        rh->op_regs = op_regs;
+        assert(hc);
+
+        rh->hc = hc;
 
         usb_hub_descriptor_header_t *header = &rh->hub_descriptor.header;
@@ -172 +174 @@
 {
         uint8_t link_state = XHCI_REG_RD(regs, XHCI_PORT_PLS);
-        // FIXME: do we have a better way to detect if this is usb2 or usb3 device?
-        if (xhci_is_usb3_port(&hc->rh, port_id)) {
+        const xhci_port_speed_t *speed = xhci_get_port_speed(&hc->rh, port_id);
+
+        usb_log_info("Detected new %.4s%u.%u device on port %u.", speed->name, speed->major, speed->minor, port_id);
+
+        if (speed->major == 3) {
                 if(link_state == 0) {
                         /* USB3 is automatically advanced to enabled. */
-                        uint8_t port_speed = XHCI_REG_RD(regs, XHCI_PORT_PS);
-                        usb_log_debug("Detected new device on port %u, port speed id %u.", port_id, port_speed);
-
                         return alloc_dev(hc, port_id, 0);
                 }
@@ -237 +239 @@
 
         return EOK;
+}
+
+const xhci_port_speed_t *xhci_get_port_speed(xhci_rh_t *rh, uint8_t port)
+{
+        xhci_port_regs_t *port_regs = &rh->hc->op_regs->portrs[port - 1];
+
+        unsigned psiv = XHCI_REG_RD(port_regs, XHCI_PORT_PS);
+        return &rh->speeds[psiv];
 }
 
@@ -343 +353 @@
 
         /* The index is 1-based. */
-        xhci_port_regs_t* regs = &hub->op_regs->portrs[setup_packet->index - 1];
+        xhci_port_regs_t* regs = &hub->hc->op_regs->portrs[setup_packet->index - 1];
 
         const uint32_t status = uint32_host2usb(