Changeset 21885c92 in mainline

Timestamp:

2018-01-20T18:27:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

24fcb8b

Parents:

2aaba7e

Message:

usbhost: handle superspeed hubs

Location:

uspace

Files:

• drv/bus/usb/xhci/device.c (modified) (1 diff)
• lib/usb/include/usb/classes/hub.h (modified) (4 diffs)
• lib/usb/include/usb/descriptor.h (modified) (1 diff)
• lib/usbhost/src/utility.c (modified) (2 diffs)

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

@@ -153 +153 @@
         dev->is_hub = 1;
         dev->num_ports = hub_desc.port_count;
-        dev->tt_think_time = 8 +
-                8  * !!(hub_desc.characteristics & HUB_CHAR_TT_THINK_8) +
-                16 * !!(hub_desc.characteristics & HUB_CHAR_TT_THINK_16);
+
+        if (dev->base.speed == USB_SPEED_HIGH) {
+                dev->tt_think_time = 8 +
+                        8  * !!(hub_desc.characteristics & HUB_CHAR_TT_THINK_8) +
+                        16 * !!(hub_desc.characteristics & HUB_CHAR_TT_THINK_16);
+        }
 
         usb_log_debug2("Device(%u): recognised USB hub with %u ports", dev->base.address, dev->num_ports);

uspace/lib/usb/include/usb/classes/hub.h

@@ -71 +71 @@
         uint8_t length;
 
-        /** Descriptor type (0x29). */
+        /** Descriptor type (0x29 or 0x2a for superspeed hub). */
         uint8_t descriptor_type;
 
@@ -116 +116 @@
 #define HUB_CHAR_OC_PER_PORT_FLAG       (1 << 3)
 #define HUB_CHAR_NO_OC_FLAG             (1 << 4)
+
+/* These are invalid for superspeed hub */
 #define HUB_CHAR_TT_THINK_16            (1 << 5)
 #define HUB_CHAR_TT_THINK_8             (1 << 6)
@@ -164 +166 @@
     /** This request sets a value reported in the hub status. */
     USB_HUB_REQ_TYPE_SET_HUB_FEATURE = 0x20,
+    /** This request sets the value that the hub uses to determine the index into the Route String Index for the hub. */
+    USB_HUB_REQ_TYPE_SET_HUB_DEPTH = 0x20,
     /** This request sets a value reported in the port status. */
-    USB_HUB_REQ_TYPE_SET_PORT_FEATURE = 0x23
+    USB_HUB_REQ_TYPE_SET_PORT_FEATURE = 0x23,
 } usb_hub_bm_request_type_t;
 
@@ -191 +195 @@
     /** */
     USB_HUB_STOP_TT = 11,
+    /** USB 3+ only */
+    USB_HUB_REQUEST_SET_HUB_DEPTH = 12,
 } usb_hub_request_t;
 

uspace/lib/usb/include/usb/descriptor.h

@@ -60 +60 @@
         USB_DESCTYPE_HID_PHYSICAL = 0x23,
         USB_DESCTYPE_HUB = 0x29,
+        USB_DESCTYPE_SSPEED_HUB = 0x2a,
         USB_DESCTYPE_SSPEED_EP_COMPANION = 0x30
         /* USB_DESCTYPE_ = */

uspace/lib/usbhost/src/utility.c

@@ -150 +150 @@
         }};
 
+        const usb_descriptor_type_t type = device->speed >= USB_SPEED_SUPER
+                ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
+
         const usb_device_request_setup_packet_t get_hub_desc = {
                 .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST
@@ -155 +158 @@
                     | USB_REQUEST_RECIPIENT_DEVICE,
                 .request = USB_DEVREQ_GET_DESCRIPTOR, \
-                .value = uint16_host2usb(USB_DESCTYPE_HUB << 8), \
+                .value = uint16_host2usb(type << 8), \
                 .length = sizeof(*desc),
         };