Changeset f92f6b1 in mainline

Timestamp:

2018-01-10T01:11:01Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4a00bc9

Parents:

708d8fcd

Message:

xhci isoch: made buffer count variable

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (1 diff)
• isoch.c (modified) (15 diffs)
• isoch.h (modified) (1 diff)
• main.c (modified) (1 diff)

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

@@ -314 +314 @@
         }
 
-        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
-                for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i) {
-                        dma_buffer_free(&xhci_ep->isoch->transfers[i].data);
-                }
-        }
+        isoch_fini(xhci_ep);
 }
 

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

@@ -35 +35 @@
 
 #include <str_error.h>
+#include <macros.h>
 
 #include "endpoint.h"
@@ -56 +57 @@
                 ? desc->companion.bytes_per_interval
                 : ep->base.max_transfer_size;
-        /* Technically there could be superspeed plus too. */
+
+        const xhci_hc_t *hc = bus_to_xhci_bus(ep->base.device->bus)->hc;
+
+        /*
+         * We shall cover at least twice the IST period, otherwise we will get
+         * an over/underrun every time.
+         */
+        isoch->buffer_count = (2 * hc->ist) / ep->interval;
+
+        /* 2 buffers are the very minimum. */
+        isoch->buffer_count = max(2, isoch->buffer_count);
+
+        usb_log_error("[isoch] isoch setup with %zu buffers", isoch->buffer_count);
 }
 
@@ -66 +79 @@
         isoch->dequeue = isoch->enqueue = isoch->hw_enqueue = 0;
 
-        for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i) {
+        for (size_t i = 0; i < isoch->buffer_count; ++i) {
                 isoch->transfers[i].state = ISOCH_EMPTY;
         }
@@ -85 +98 @@
         }
 
-        for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i)
-                dma_buffer_free(&isoch->transfers[i].data);
+        if (isoch->transfers) {
+                for (size_t i = 0; i < isoch->buffer_count; ++i)
+                        dma_buffer_free(&isoch->transfers[i].data);
+                free(isoch->transfers);
+        }
 }
 
@@ -100 +116 @@
                 return ENOMEM;
 
-        for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i) {
+        isoch->transfers = calloc(isoch->buffer_count, sizeof(xhci_isoch_transfer_t));
+        if(!isoch->transfers)
+                goto err;
+ 
+        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)) {
-                        isoch_fini(ep);
-                        return ENOMEM;
+                        goto err;
                 }
         }
@@ -113 +132 @@
 
         return EOK;
+err:
+        isoch_fini(ep);
+        return ENOMEM;
 }
 
@@ -151 +173 @@
                  * buffers */
                 it->mfindex = XHCI_REG_RD(hc->rt_regs, XHCI_RT_MFINDEX) + 1
-                       + XHCI_ISOCH_BUFFER_COUNT * ep->interval
+                       + isoch->buffer_count * ep->interval
                        + hc->ist;
 
@@ -207 +229 @@
          * TODO: The "size" of the clock is too low. We have to scale it a bit
          * to ensure correct scheduling of transfers, that are
-         * XHCI_ISOCH_BUFFER_COUNT * interval away from now.
+         * buffer_count * interval away from now.
          * Maximum interval is 8 seconds, which means we need a size of 
          * 16 seconds. The size of MFIINDEX is 2 seconds only.
@@ -268 +290 @@
                         }
 
-                        isoch->hw_enqueue = (isoch->hw_enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+                        isoch->hw_enqueue = (isoch->hw_enqueue + 1) % isoch->buffer_count;
                         break;
 
@@ -279 +301 @@
                         it->size = 0;
 
-                        isoch->hw_enqueue = (isoch->hw_enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+                        isoch->hw_enqueue = (isoch->hw_enqueue + 1) % isoch->buffer_count;
                         break;
                 }
@@ -353 +375 @@
                         /* fallthrough */
                 case WINDOW_INSIDE:
-                        isoch->enqueue = (isoch->enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+                        isoch->enqueue = (isoch->enqueue + 1) % isoch->buffer_count;
                         isoch->last_mfindex = it->mfindex;
 
@@ -417 +439 @@
         }
 
-        isoch->enqueue = (isoch->enqueue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+        isoch->enqueue = (isoch->enqueue + 1) % isoch->buffer_count;
 
         /* Withdraw results from previous transfers. */
@@ -423 +445 @@
         xhci_isoch_transfer_t *res = &isoch->transfers[isoch->dequeue];
         while (res->state == ISOCH_COMPLETE) {
-                isoch->dequeue = (isoch->dequeue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+                isoch->dequeue = (isoch->dequeue + 1) % isoch->buffer_count;
 
                 res->state = ISOCH_EMPTY;
@@ -487 +509 @@
         }
 
-        isoch->dequeue = (isoch->dequeue + 1) % XHCI_ISOCH_BUFFER_COUNT;
+        isoch->dequeue = (isoch->dequeue + 1) % isoch->buffer_count;
 
         /* Withdraw results from previous transfer. */
@@ -543 +565 @@
          * which one it is.
          */
-        for (size_t i = 0; i < XHCI_ISOCH_BUFFER_COUNT; ++i) {
+        for (size_t i = 0; i < isoch->buffer_count; ++i) {
                 xhci_isoch_transfer_t * const it = &isoch->transfers[i];
 

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

@@ -87 +87 @@
         uint32_t last_mfindex;
 
+        /** The number of transfer buffers allocated */
+        size_t buffer_count;
+
         /** Isochronous scheduled transfers with respective buffers */
-        #define XHCI_ISOCH_BUFFER_COUNT 4
-        xhci_isoch_transfer_t transfers[XHCI_ISOCH_BUFFER_COUNT];
+        xhci_isoch_transfer_t *transfers;
 
         /**

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

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