Changeset 5c75456 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2017-12-29T17:11:14Z (6 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

bf7b747

Parents:

5dfb70c9

git-author:

Salmelu <salmelu@…> (2017-12-29 17:10:05)

git-committer:

Salmelu <salmelu@…> (2017-12-29 17:11:14)

Message:

xhci: isochronous transfers made working

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (5 diffs)

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

@@ -234 +234 @@
 
 static xhci_isoch_transfer_t* isoch_transfer_get_enqueue(xhci_endpoint_t *ep) {
-        if ((ep->isoch_enqueue % XHCI_ISOCH_BUFFER_COUNT) == ep->isoch_dequeue) {
+        if (((ep->isoch_enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT) == ep->isoch_dequeue) {
                 /* None ready */
                 return NULL;
@@ -303 +303 @@
 
         /* If not yet started, start the isochronous endpoint transfers - after buffer count - 1 writes */
-        /* The -2 is there because of the enqueue != dequeue check. The buffer must have at least 2 transfers. */
-        if (xhci_ep->isoch_enqueue == XHCI_ISOCH_BUFFER_COUNT - 2 && !xhci_ep->isoch_started) {
+        /* The -1 is there because of the enqueue != dequeue check. The buffer must have at least 2 transfers. */
+        if (((xhci_ep->isoch_enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT) == xhci_ep->isoch_dequeue && !xhci_ep->isoch_started) {
                 const uint8_t slot_id = xhci_dev->slot_id;
                 const uint8_t target = xhci_endpoint_index(xhci_ep) + 1; /* EP Doorbells start at 1 */
@@ -322 +322 @@
 }
 
+static int schedule_isochronous_in_trbs(xhci_endpoint_t *xhci_ep, xhci_trb_ring_t *ring) {
+        xhci_trb_t trb;
+        xhci_isoch_transfer_t *isoch_transfer;
+        while ((isoch_transfer = isoch_transfer_get_enqueue(xhci_ep)) != NULL) {
+                xhci_trb_clean(&trb);
+                trb.parameter = isoch_transfer->data.phys;
+                isoch_transfer->size = xhci_ep->isoch_max_size;
+
+                int err = schedule_isochronous_trb(ring, xhci_ep, &trb, isoch_transfer->size,
+                        &isoch_transfer->interrupt_trb_phys);
+                if (err)
+                        return err;
+        }
+        return EOK;
+}
+
 static int schedule_isochronous_in(xhci_hc_t* hc, xhci_transfer_t* transfer, xhci_endpoint_t *xhci_ep,
         xhci_device_t *xhci_dev)
@@ -328 +344 @@
         /* If not yet started, start the isochronous endpoint transfers - before first read */
         if (!xhci_ep->isoch_started) {
+                xhci_trb_ring_t *ring = get_ring(hc, transfer);
+                /* Fill the TRB ring. */
+                int err = schedule_isochronous_in_trbs(xhci_ep, ring);
+                if (err) {
+                        fibril_mutex_unlock(&xhci_ep->isoch_guard);
+                        return err;
+                }
+                /* Ring the doorbell to start it. */
                 const uint8_t slot_id = xhci_dev->slot_id;
                 const uint8_t target = xhci_endpoint_index(xhci_ep) + 1; /* EP Doorbells start at 1 */
-                int err = hc_ring_doorbell(hc, slot_id, target);
+                err = hc_ring_doorbell(hc, slot_id, target);
                 if (err) {
                         fibril_mutex_unlock(&xhci_ep->isoch_guard);
@@ -406 +430 @@
                 case XHCI_TRBC_RING_OVERRUN:
                 case XHCI_TRBC_RING_UNDERRUN:
-                        // TODO: abort the phone; rings are unscheduled by xHC by now
+                        /* Rings are unscheduled by xHC now */
                         ep->isoch_started = false;
+                        /* For OUT, there was nothing to process */
+                        /* For IN, the buffer has overfilled, we empty the buffers and readd TRBs */
+                        ep->isoch_enqueue = ep->isoch_dequeue = 0;
                         err = EIO;
                         break;