Changeset 708d8fcd in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2018-01-10T00:46:29Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

f92f6b1

Parents:

4793023

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-09 19:26:55)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-10 00:46:29)

Message:

xhci: rewritten isochronous transfers

There was a fundamental problem with relying on hardware to send
RING_OVERRUN/UNDERRUN events, which QEMU (and possibly others) do not
send. That resulted in not knowing if the transfer is still on schedule,
and having to ring the doorbell every time. That is not feasible,
because then the transfer can be more frequent than it should be.
Furthermore, it ignored the fact that isochronous TRBs are to be
scheduled not too late, but also not too soon (see 4.11.2.5 of the xHCI
spec).

Now, scheduling the TRBs to hardware is called feeding, and can be
delayed by setting a timer. Ring overruns/underruns are detected also at
the end of handling an event.

File:

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

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

@@ -84 +84 @@
          */
         if (dev->speed >= USB_SPEED_HIGH || ep->transfer_type != USB_TRANSFER_INTERRUPT) {
-                xhci_ep->interval = desc->endpoint.poll_interval;
+                xhci_ep->interval = 1 << (xhci_ep->interval - 1);
         }
 
@@ -92 +92 @@
         }
 
-        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                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. */
-
-                /* Allocate and setup isochronous-specific structures. */
-                xhci_ep->isoch->enqueue = 0;
-                xhci_ep->isoch->dequeue = 0;
-                xhci_ep->isoch->started = false;
-
-                fibril_mutex_initialize(&xhci_ep->isoch->guard);
-                fibril_condvar_initialize(&xhci_ep->isoch->avail);
-        }
+        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                isoch_init(xhci_ep, desc);
 
         if ((rc = alloc_transfer_ds(xhci_ep)))
@@ -272 +260 @@
 }
 
-/** TODO document this
- */
-static int xhci_isoch_alloc_transfers(xhci_endpoint_t *xhci_ep) {
-        int i = 0;
-        int err = EOK;
-        while (i < XHCI_ISOCH_BUFFER_COUNT) {
-                xhci_isoch_transfer_t *transfer = &xhci_ep->isoch->transfers[i];
-                if (dma_buffer_alloc(&transfer->data, xhci_ep->isoch->max_size)) {
-                        err = ENOMEM;
-                        break;
-                }
-                transfer->size = 0;
-                ++i;
-        }
-
-        if (err) {
-                --i;
-                while(i >= 0) {
-                        dma_buffer_free(&xhci_ep->isoch->transfers[i].data);
-                        --i;
-                }
-        }
-
-        return err;
-}
-
 /** Allocate transfer data structures for XHCI endpoint.
  * @param[in] xhci_ep XHCI endpoint to allocate data structures for.
@@ -316 +278 @@
 
         if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                if ((err = xhci_isoch_alloc_transfers(xhci_ep))) {
+                if ((err = isoch_alloc_transfers(xhci_ep))) {
                         xhci_trb_ring_fini(&xhci_ep->ring);
                         return err;
@@ -427 +389 @@
         XHCI_EP_TR_DPTR_SET(*ctx, ep->ring.dequeue);
         XHCI_EP_DCS_SET(*ctx, 1);
-        XHCI_EP_INTERVAL_SET(*ctx, fnzb32(ep->interval) % 32 - 1);
+        XHCI_EP_INTERVAL_SET(*ctx, fnzb32(ep->interval) % 32);
 
         XHCI_EP_MAX_ESIT_PAYLOAD_LO_SET(*ctx, ep->isoch->max_size & 0xFFFF);
@@ -446 +408 @@
         XHCI_EP_TR_DPTR_SET(*ctx, ep->ring.dequeue);
         XHCI_EP_DCS_SET(*ctx, 1);
-        XHCI_EP_INTERVAL_SET(*ctx, fnzb32(ep->interval) % 32 - 1);
+        XHCI_EP_INTERVAL_SET(*ctx, fnzb32(ep->interval) % 32);
         // TODO: max ESIT payload
 }