Changeset 9efad54 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2018-01-06T21:15: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:

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).

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (3 diffs)

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);
 }