Changeset 5f0b366 in mainline

Timestamp:

2018-01-25T02:05:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

b357377

Parents:

e8277c0

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-24 19:34:07)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usbhost: prepare bandwidth accounting privatization to usb2_bus

The endpoint does not account the bandwidth by default. The next step is
moving the count_bw callback to the usb2 bus.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/endpoint.h (modified) (2 diffs)
• src/endpoint.c (modified) (3 diffs)
• src/usb2_bus.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -87 +87 @@
         fibril_condvar_t avail;
 
-        /** Reserved bandwidth. Needed for USB2 bus. */
-        size_t bandwidth;
         /** Endpoint number */
         usb_endpoint_t endpoint;
@@ -121 +119 @@
 extern void endpoint_deactivate_locked(endpoint_t *);
 
-/* Calculate bandwidth */
-ssize_t endpoint_count_bw(endpoint_t *, size_t);
-
 int endpoint_send_batch(endpoint_t *, usb_target_t, usb_direction_t,
     char *, size_t, uint64_t, usbhc_iface_transfer_callback_t, void *,

uspace/lib/usbhost/src/endpoint.c

@@ -74 +74 @@
 
         ep->max_transfer_size = ep->max_packet_size * ep->packets_per_uframe;
-
-        ep->bandwidth = endpoint_count_bw(ep, ep->max_transfer_size);
 }
 
@@ -201 +199 @@
         ep->active_batch = NULL;
         fibril_condvar_signal(&ep->avail);
-}
-
-/**
- * Call the bus operation to count bandwidth.
- *
- * @param ep Endpoint on which the transfer will take place.
- * @param size The payload size.
- */
-ssize_t endpoint_count_bw(endpoint_t *ep, size_t size)
-{
-        assert(ep);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(get_bus_ops(ep), endpoint_count_bw);
-        if (!ops)
-                return 0;
-
-        return ops->endpoint_count_bw(ep, size);
 }
 
@@ -262 +243 @@
         }
 
+        /** Limit transfers with reserved bandwidth to the amount reserved */
+        if ((ep->transfer_type == USB_TRANSFER_INTERRUPT
+            || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)
+            && size > ep->max_transfer_size)
+                return ENOSPC;
+
         /* Offline devices don't schedule transfers other than on EP0. */
-        if (!device->online && ep->endpoint > 0) {
+        if (!device->online && ep->endpoint > 0)
                 return EAGAIN;
-        }
-
-        const size_t bw = endpoint_count_bw(ep, size);
-        /* Check if we have enough bandwidth reserved */
-        if (ep->bandwidth < bw) {
-                usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
-                    "but only %zu is reserved.\n",
-                    device->address, ep->endpoint, name, bw, ep->bandwidth);
-                return ENOSPC;
-        }
 
         usb_transfer_batch_t *batch = usb_transfer_batch_create(ep);

uspace/lib/usbhost/src/usb2_bus.c

@@ -210 +210 @@
 
 /**
+ * Call the bus operation to count bandwidth.
+ *
+ * @param ep Endpoint on which the transfer will take place.
+ * @param size The payload size.
+ */
+static ssize_t endpoint_count_bw(endpoint_t *ep)
+{
+        assert(ep);
+
+        bus_t *bus = ep->device->bus;
+        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, endpoint_count_bw);
+        if (!ops)
+                return 0;
+
+        return ops->endpoint_count_bw(ep, ep->max_transfer_size);
+}
+
+/**
  * Register an endpoint to the bus. Reserves bandwidth.
  */
@@ -218 +236 @@
         assert(ep);
 
+        size_t bw = endpoint_count_bw(ep);
+
         /* Check for available bandwidth */
-        if (ep->bandwidth > bus->free_bw)
+        if (bw > bus->free_bw)
                 return ENOSPC;
 
-        bus->free_bw -= ep->bandwidth;
+        bus->free_bw -= bw;
 
         return EOK;
@@ -235 +255 @@
         assert(ep);
 
-        bus->free_bw += ep->bandwidth;
+        bus->free_bw += endpoint_count_bw(ep);
 }