Changeset 6b433a8 in mainline for uspace/drv/bus/usb

Timestamp:

2017-11-20T19:14:31Z (8 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

27b0ea0

Parents:

d3086873

Message:

Isochronous transfers - endpoint initialization

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (1 diff)
• endpoint.c (modified) (3 diffs)
• hw_struct/context.h (modified) (2 diffs)
• transfers.c (modified) (4 diffs)
• transfers.h (modified) (1 diff)

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

@@ -68 +68 @@
         ep->max_streams = desc->usb3.max_streams;
         ep->max_burst = desc->usb3.max_burst;
-        // TODO add this property to usb_endpoint_desc_t and fetch it from ss companion desc
-        ep->mult = 0;
+        ep->mult = desc->usb3.mult;
+
+        if (ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                if (ep->base.device->speed <= USB_SPEED_HIGH) {
+                        ep->isoch_max_size = desc->max_packet_size * (desc->packets + 1);
+                }
+                else if (ep->base.device->speed == USB_SPEED_SUPER) {
+                        ep->isoch_max_size = desc->usb3.bytes_per_interval;
+                }
+                /* Technically there could be superspeed plus too. */
+
+                /* Allocate and setup isochronous-specific structures. */
+                ep->isoch_enqueue = 0;
+                ep->isoch_dequeue = XHCI_ISOCH_BUFFER_COUNT - 1;
+                ep->isoch_started = false;
+        }
 
         return xhci_endpoint_alloc_transfer_ds(ep);

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

@@ -193 +193 @@
 }
 
+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;
+}
+
 int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
@@ -203 +227 @@
         if ((err = xhci_trb_ring_init(&xhci_ep->ring))) {
                 return err;
+        }
+
+        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                if((err = xhci_isoch_alloc_transfers(xhci_ep))) {
+                        xhci_trb_ring_fini(&xhci_ep->ring);
+                        return err;
+                }
         }
 
@@ -289 +320 @@
         XHCI_EP_TR_DPTR_SET(*ctx, ep->ring.dequeue);
         XHCI_EP_DCS_SET(*ctx, 1);
-        // TODO: max ESIT payload
+
+        XHCI_EP_MAX_ESIT_PAYLOAD_LO_SET(*ctx, ep->isoch_max_size & 0xFFFF);
+        XHCI_EP_MAX_ESIT_PAYLOAD_HI_SET(*ctx, (ep->isoch_max_size >> 16) & 0xFF);
 }
 

uspace/drv/bus/usb/xhci/hw_struct/context.h

@@ -76 +76 @@
 #define XHCI_EP_MAX_ESIT_PAYLOAD_LO_SET(ctx, val) \
         xhci_dword_set_bits(&(ctx).data3, val, 31, 16)
+#define XHCI_EP_MAX_ESIT_PAYLOAD_HI_SET(ctx, val) \
+        xhci_dword_set_bits(&(ctx).data[0], val, 31, 24)
 #define XHCI_EP_INTERVAL_SET(ctx, val) \
         xhci_dword_set_bits(&(ctx).data[0], val, 23, 16)
@@ -102 +104 @@
 #define XHCI_EP_TR_DPTR(ctx)            XHCI_QWORD_EXTRACT((ctx).data2, 63,  4)
 
-#define XHCI_EP_MAX_ESIT_PAYLOAD_LO(ctx) XHCI_DWORD_EXTRACT((ctx).data3, 31,  16)
+#define XHCI_EP_MAX_ESIT_PAYLOAD_LO(ctx) XHCI_DWORD_EXTRACT((ctx).data3, 31, 16)
+#define XHCI_EP_MAX_ESIT_PAYLOAD_HI(ctx) XHCI_DWORD_EXTRACT((ctx).data[0], 31, 24)
 
 } __attribute__((packed)) xhci_ep_ctx_t;

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

@@ -287 +287 @@
         isoch_transfer->size = transfer->batch.buffer_size;
         if (isoch_transfer->size > 0) {
-                memcpy(isoch_transfer->data_virt, transfer->batch.buffer, isoch_transfer->size);
-        }
-
-        trb.parameter = isoch_transfer->data_phys;
+                memcpy(isoch_transfer->data.virt, transfer->batch.buffer, isoch_transfer->size);
+        }
+
+        trb.parameter = isoch_transfer->data.phys;
 
         xhci_trb_ring_t *ring = get_ring(hc, transfer);
@@ -341 +341 @@
         if (transfer->batch.buffer_size <= isoch_transfer->size) {
                 if (transfer->batch.buffer_size > 0) {
-                        memcpy(transfer->batch.buffer, isoch_transfer->data_virt, transfer->batch.buffer_size);
+                        memcpy(transfer->batch.buffer, isoch_transfer->data.virt, transfer->batch.buffer_size);
                 }
                 if (transfer->batch.buffer_size < isoch_transfer->size) {
@@ -349 +349 @@
         }
         else {
-                memcpy(transfer->batch.buffer, isoch_transfer->data_virt, isoch_transfer->size);
+                memcpy(transfer->batch.buffer, isoch_transfer->data.virt, isoch_transfer->size);
                 transfer->batch.transfered_size = isoch_transfer->size;
         }
@@ -357 +357 @@
         xhci_trb_clean(&trb);
 
-        trb.parameter = isoch_transfer->data_phys;
+        trb.parameter = isoch_transfer->data.phys;
         isoch_transfer->size = xhci_ep->isoch_max_size;
 

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

@@ -58 +58 @@
         /* Used buffer size */
         uint64_t size;
-        /* Pointer to data in virt memory */
-        void *data_virt;
-        /* Physical address of the buffer */
-        uintptr_t data_phys;
+        /* Buffer with data */
+        dma_buffer_t data;
         /* Physical address of enqueued TRB */
         uintptr_t interrupt_trb_phys;