Changeset 398a94c in mainline

Timestamp:

2018-01-10T13:32:21Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

8bab0d2

Parents:

4a00bc9

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:32:19)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:32:21)

Message:

xhci isoch: bug fixing

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (2 diffs)
• isoch.c (modified) (9 diffs)
• main.c (modified) (1 diff)

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

@@ -65 +65 @@
         endpoint_init(ep, dev, desc);
 
-        xhci_ep->max_streams = 1 << (USB_SSC_MAX_STREAMS(desc->companion));
         xhci_ep->max_burst = desc->companion.max_burst + 1;
-        xhci_ep->mult = USB_SSC_MULT(desc->companion) + 1;
+
+        if (ep->transfer_type == USB_TRANSFER_BULK)
+                xhci_ep->max_streams = 1 << (USB_SSC_MAX_STREAMS(desc->companion));
+        else
+                xhci_ep->max_streams = 1;
+
+        if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                xhci_ep->mult = USB_SSC_MULT(desc->companion) + 1;
+        else
+                xhci_ep->mult = 1;
 
         /* In USB 3, the semantics of wMaxPacketSize changed. Now the number of
@@ -314 +322 @@
         }
 
-        isoch_fini(xhci_ep);
+        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                isoch_fini(xhci_ep);
 }
 

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

@@ -54 +54 @@
         fibril_condvar_initialize(&isoch->avail);
 
-        isoch->max_size = desc->companion.bytes_per_interval
-                ? desc->companion.bytes_per_interval
-                : ep->base.max_transfer_size;
-
         const xhci_hc_t *hc = bus_to_xhci_bus(ep->base.device->bus)->hc;
 
@@ -122 +118 @@
         for (size_t i = 0; i < isoch->buffer_count; ++i) {
                 xhci_isoch_transfer_t *transfer = &isoch->transfers[i];
-                if (dma_buffer_alloc(&transfer->data, isoch->max_size)) {
+                if (dma_buffer_alloc(&transfer->data, ep->base.max_transfer_size)) {
                         goto err;
                 }
@@ -276 +272 @@
                         fibril_timer_set_locked(isoch->feeding_timer, delay,
                             isoch_feed_out_timer, ep);
-                        break;
+                        goto out;
                 }
 
@@ -305 +301 @@
                 }
         }
+out:
 
         if (fed) {
@@ -345 +342 @@
                 /* IN buffers are "filled" with free space */
                 if (it->state == ISOCH_EMPTY) {
-                        it->size = isoch->max_size;
+                        it->size = ep->base.max_transfer_size;
                         it->state = ISOCH_FILLED;
                         calc_next_mfindex(ep, it);
@@ -361 +358 @@
                         fibril_timer_set_locked(isoch->feeding_timer, delay,
                             isoch_feed_in_timer, ep);
-                        break;
+                        goto out;
                 }
 
@@ -391 +388 @@
                 }
         }
+out:
 
         if (fed) {
@@ -422 +420 @@
         xhci_isoch_t * const isoch = ep->isoch;
 
-        if (transfer->batch.buffer_size > isoch->max_size) {
+        if (transfer->batch.buffer_size > ep->base.max_transfer_size) {
                 usb_log_error("Cannot schedule an oversized isochronous transfer.");
                 return ELIMIT;
@@ -487 +485 @@
         xhci_isoch_t * const isoch = ep->isoch;
 
-        if (transfer->batch.buffer_size < isoch->max_size) {
+        if (transfer->batch.buffer_size < ep->base.max_transfer_size) {
                 usb_log_error("Cannot schedule an undersized isochronous transfer.");
                 return ELIMIT;

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

@@ -115 +115 @@
 {
         log_init(NAME);
-        logctl_set_log_level(NAME, LVL_NOTE);
+        logctl_set_log_level(NAME, LVL_DEBUG);
         return hc_driver_main(&xhci_driver);
 }