Changeset 9efad54 in mainline for uspace/drv

Timestamp:

2018-01-06T21:15:48Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

56257ba

Parents:

c901632

Message:

usb: move endpoint descriptor parsing to HC

This better separates responsibilities. Now the device driver does not
care about the contents of an endpoint descriptor, and HC can parse the
values according to device's actual speed.

Currently, it is device driver's responsibility to fetch endpoint
descriptors, map them and register pipes - sending the endpoint
descriptor back to HC. HC then parses it, and fills the pipe
description, which then sends back to device driver. We shall probably
fetch the endpoint descriptor from inside the HC (also fixing the USB
spec violation of communication with EP0).

Location:

uspace/drv

Files:

• block/usbmast/main.c (modified) (1 diff)
• bus/usb/ehci/ehci_bus.c (modified) (1 diff)
• bus/usb/ehci/hw_struct/queue_head.c (modified) (1 diff)
• bus/usb/ohci/ohci_bus.c (modified) (1 diff)
• bus/usb/xhci/bus.c (modified) (2 diffs)
• bus/usb/xhci/endpoint.c (modified) (3 diffs)
• bus/usb/xhci/endpoint.h (modified) (1 diff)
• hid/usbhid/main.c (modified) (1 diff)

uspace/drv/block/usbmast/main.c

@@ -172 +172 @@
             usb_device_get_name(dev));
         usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
-            epm_in->pipe.desc.endpoint_no, epm_in->pipe.desc.max_packet_size);
+            epm_in->pipe.desc.endpoint_no, epm_in->pipe.desc.max_transfer_size);
         usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            epm_out->pipe.desc.endpoint_no, epm_out->pipe.desc.max_packet_size);
+            epm_out->pipe.desc.endpoint_no, epm_out->pipe.desc.max_transfer_size);
 
         usb_log_debug("Get LUN count...\n");

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -78 +78 @@
 /** Creates new hcd endpoint representation.
  */
-static endpoint_t *ehci_endpoint_create(device_t *dev, const usb_endpoint_desc_t *desc)
+static endpoint_t *ehci_endpoint_create(device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
         assert(dev);

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -82 +82 @@
         }
         uint32_t ep_cap = QH_EP_CAP_C_MASK_SET(3 << 2) |
-                    QH_EP_CAP_MULTI_SET(ep->packets);
+                    QH_EP_CAP_MULTI_SET(ep->packets_per_uframe);
         if (ep->device->speed != USB_SPEED_HIGH) {
                 ep_cap |=

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -72 +72 @@
 /** Creates new hcd endpoint representation.
  */
-static endpoint_t *ohci_endpoint_create(device_t *dev, const usb_endpoint_desc_t *desc)
+static endpoint_t *ohci_endpoint_create(device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
         assert(dev);

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

@@ -51 +51 @@
 
 /** Initial descriptor used for control endpoint 0 before more configuration is retrieved. */
-static const usb_endpoint_desc_t ep0_initial_desc = {
-        .endpoint_no = 0,
-        .direction = USB_DIRECTION_BOTH,
-        .transfer_type = USB_TRANSFER_CONTROL,
-        .max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
-        .packets = 1,
+static const usb_endpoint_descriptors_t ep0_initial_desc = {
+        .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
 };
 
-static endpoint_t *endpoint_create(device_t *, const usb_endpoint_desc_t *);
+static endpoint_t *endpoint_create(device_t *, const usb_endpoint_descriptors_t *);
 
 /** Assign address and control endpoint to a new XHCI device.
@@ -368 +364 @@
 }
 
-static endpoint_t *endpoint_create(device_t *dev, const usb_endpoint_desc_t *desc)
+static endpoint_t *endpoint_create(device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
         xhci_endpoint_t *ep = calloc(1, sizeof(xhci_endpoint_t));

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

@@ -52 +52 @@
  * @return Error code.
  */
-int xhci_endpoint_init(xhci_endpoint_t *xhci_ep, device_t *dev, const usb_endpoint_desc_t *desc)
+int xhci_endpoint_init(xhci_endpoint_t *xhci_ep, device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
         assert(xhci_ep);
@@ -60 +60 @@
         endpoint_init(ep, dev, desc);
 
-        xhci_ep->max_streams = desc->usb3.max_streams;
-        xhci_ep->max_burst = desc->usb3.max_burst;
-        xhci_ep->mult = desc->usb3.mult;
-
-        // TODO: process according to 6.2.3.6 of XHCI specification; hardcoded for HS/SS EPs
-        xhci_ep->interval = desc->interval - 1;
+        xhci_ep->max_streams = USB_SSC_MAX_STREAMS(desc->companion);
+        xhci_ep->max_burst = desc->companion.max_burst + 1;
+        xhci_ep->mult = USB_SSC_MULT(desc->companion) + 1;
+
+        /* In USB 3, the semantics of wMaxPacketSize changed. Now the number of
+         * packets per service interval is determined from max_burst and mult.
+         */
+        if (dev->speed >= USB_SPEED_SUPER) {
+                ep->packets_per_uframe = xhci_ep->max_burst * xhci_ep->mult;
+                ep->max_transfer_size = ep->max_packet_size * ep->packets_per_uframe;
+        }
+
+        xhci_ep->interval = desc->endpoint.poll_interval;
+        /* Only Low/Full speed interrupt endpoints have interval set directly,
+         * others have 2-based log of it.
+         */
+        if (dev->speed >= USB_SPEED_HIGH || ep->transfer_type != USB_TRANSFER_INTERRUPT) {
+                xhci_ep->interval = 1 << (xhci_ep->interval - 1);
+        }
 
         if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                xhci_ep->isoch_max_size = desc->usb3.bytes_per_interval
-                        ? desc->usb3.bytes_per_interval
-                        : desc->max_packet_size * (desc->packets + 1);
+                xhci_ep->isoch_max_size = desc->companion.bytes_per_interval
+                        ? desc->companion.bytes_per_interval
+                        : ep->max_transfer_size;
                 /* Technically there could be superspeed plus too. */
 
@@ -497 +510 @@
         dev->endpoints[ep->base.endpoint] = NULL;
         ep->base.device = NULL;
-
-        endpoint_del_ref(&ep->base);
 }
 

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

@@ -149 +149 @@
 #define XHCI_DEV_ARGS(dev)               ddf_fun_get_name((dev).base.fun), (dev).slot_id
 
-int xhci_endpoint_init(xhci_endpoint_t *, device_t *, const usb_endpoint_desc_t *);
+int xhci_endpoint_init(xhci_endpoint_t *, device_t *, const usb_endpoint_descriptors_t *);
 void xhci_endpoint_fini(xhci_endpoint_t *);
 int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *);

uspace/drv/hid/usbhid/main.c

@@ -95 +95 @@
            usb_hid_polling_callback,
            /* How much data to request. */
-           hid_dev->poll_pipe_mapping->pipe.desc.max_packet_size,
+           hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size,
            /* Delay */
            -1,