Changeset af16ebe in mainline

Timestamp:

2018-02-05T00:54:52Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

239eea41

Parents:

c21e6a5

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:49:07)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:52)

Message:

usb: redefine max_transfer_size

Location:

uspace

Files:

• drv/bus/usb/xhci/endpoint.c (modified) (1 diff)
• drv/bus/usb/xhci/trb_ring.c (modified) (2 diffs)
• drv/bus/usb/xhci/trb_ring.h (modified) (1 diff)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• lib/usbhost/src/endpoint.c (modified) (1 diff)

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

@@ -92 +92 @@
                         ep->max_transfer_size = ep->max_packet_size * ep->packets_per_uframe;
                 }
-                else {
-                        ep->max_transfer_size = 200 * PAGE_SIZE;
-                }
         }
 

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

@@ -223 +223 @@
         errno_t err;
         assert(trbs > 0);
+
+        if (trbs > xhci_trb_ring_size(ring))
+                return ELIMIT;
+
         fibril_mutex_lock(&ring->guard);
 
@@ -309 +313 @@
 }
 
+size_t xhci_trb_ring_size(xhci_trb_ring_t *ring)
+{
+        return ring->segment_count * SEGMENT_TRB_USEFUL_COUNT;
+}
+
 /**
  * Initializes an event ring.

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

@@ -78 +78 @@
 extern errno_t xhci_trb_ring_enqueue(xhci_trb_ring_t *, xhci_trb_t *, uintptr_t *);
 extern errno_t xhci_trb_ring_enqueue_multiple(xhci_trb_ring_t *, xhci_trb_t *, size_t, uintptr_t *);
+extern size_t xhci_trb_ring_size(xhci_trb_ring_t *);
 
 extern void xhci_trb_ring_reset_dequeue_state(xhci_trb_ring_t *ring, uintptr_t *addr);

uspace/lib/drv/include/usbhc_iface.h

@@ -116 +116 @@
         usb_direction_t direction;
 
-        /** Maximum size of one transfer */
+        /**
+         * Maximum size of one transfer. Non-periodic endpoints may handle
+         * bigger transfers, but those can be split into multiple USB transfers.
+         */
         size_t max_transfer_size;
 

uspace/lib/usbhost/src/endpoint.c

@@ -244 +244 @@
         }
 
-        /** Limit transfers with reserved bandwidth to the amount reserved */
-        if (ep->direction == USB_DIRECTION_OUT && size > ep->max_transfer_size)
-                return ENOSPC;
+        /*
+         * Limit transfers with reserved bandwidth to the amount reserved.
+         * OUT transfers are rejected, IN can be just trimmed in advance.
+         */
+        if ((ep->transfer_type == USB_TRANSFER_INTERRUPT || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS) && size > ep->max_transfer_size) {
+                if (direction == USB_DIRECTION_OUT)
+                        return ENOSPC;
+                else
+                        size = ep->max_transfer_size;
+
+        }
 
         /* Offline devices don't schedule transfers other than on EP0. */