Changeset 17873ac7 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2017-10-31T19:06:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

479e32d

Parents:

a312d8f

Message:

usbhost endpoint: endpoint→active replaced by tracking active batch

The mechanism is optional, synchronization over endpoint is now not forced. It will be used by xhci to utilize streams.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• transfer_list.c (modified) (2 diffs)
• uhci_batch.c (modified) (7 diffs)
• uhci_batch.h (modified) (1 diff)

uspace/drv/bus/usb/uhci/hc.c

@@ -177 +177 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(current);
-                        uhci_transfer_batch_finish(batch);
+                        usb_transfer_batch_finish(&batch->base);
                 }
         }

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -115 +115 @@
         assert(instance);
         assert(uhci_batch);
+
+        endpoint_t *ep = uhci_batch->base.ep;
+
+        /* First, wait until the endpoint is free to use */
+        fibril_mutex_lock(&ep->guard);
+        endpoint_activate_locked(ep, &uhci_batch->base);
+        fibril_mutex_unlock(&ep->guard);
+
         usb_log_debug2("Batch %p adding to queue %s.\n",
             uhci_batch, instance->name);
@@ -189 +197 @@
                     uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
-                uhci_transfer_batch_abort(batch);
+                endpoint_abort(batch->base.ep);
         }
         fibril_mutex_unlock(&instance->guard);

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -64 +64 @@
 }
 
-void uhci_transfer_batch_finish(uhci_transfer_batch_t *batch)
-{
-        if (batch->base.dir == USB_DIRECTION_IN) {
-                assert(batch->base.transfered_size <= batch->base.buffer_size);
-                memcpy(batch->base.buffer, uhci_transfer_batch_data_buffer(batch), batch->base.transfered_size);
-        }
-        usb_transfer_batch_finish(&batch->base);
-}
-
 /** Allocate memory and initialize internal data structure.
  *
@@ -113 +104 @@
         }
 
-        const size_t setup_size = (uhci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL)
+        const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL)
                 ? USB_SETUP_PACKET_SIZE
                 : 0;
@@ -165 +156 @@
 {
         assert(uhci_batch);
+        usb_transfer_batch_t *batch = &uhci_batch->base;
 
         usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
             " checking %zu transfer(s) for completion.\n",
-            uhci_batch, USB_TRANSFER_BATCH_ARGS(uhci_batch->base),
+            uhci_batch, USB_TRANSFER_BATCH_ARGS(*batch),
             uhci_batch->td_count);
-        uhci_batch->base.transfered_size = 0;
+        batch->transfered_size = 0;
 
         for (size_t i = 0;i < uhci_batch->td_count; ++i) {
@@ -177 +169 @@
                 }
 
-                uhci_batch->base.error = td_status(&uhci_batch->tds[i]);
-                if (uhci_batch->base.error != EOK) {
-                        assert(uhci_batch->base.ep != NULL);
+                batch->error = td_status(&uhci_batch->tds[i]);
+                if (batch->error != EOK) {
+                        assert(batch->ep != NULL);
 
                         usb_log_debug("Batch %p found error TD(%zu->%p):%"
@@ -186 +178 @@
                         td_print_status(&uhci_batch->tds[i]);
 
-                        endpoint_toggle_set(uhci_batch->base.ep,
+                        endpoint_toggle_set(batch->ep,
                             td_toggle(&uhci_batch->tds[i]));
                         if (i > 0)
@@ -193 +185 @@
                 }
 
-                uhci_batch->base.transfered_size
+                batch->transfered_size
                     += td_act_size(&uhci_batch->tds[i]);
                 if (td_is_short(&uhci_batch->tds[i]))
@@ -199 +191 @@
         }
 substract_ret:
-        if (uhci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL)
-                uhci_batch->base.transfered_size -= USB_SETUP_PACKET_SIZE;
+        if (batch->ep->transfer_type == USB_TRANSFER_CONTROL)
+                batch->transfered_size -= USB_SETUP_PACKET_SIZE;
+
+        fibril_mutex_lock(&batch->ep->guard);
+        usb_transfer_batch_reset_toggle(batch);
+        endpoint_deactivate_locked(batch->ep);
+        fibril_mutex_unlock(&batch->ep->guard);
+
+        if (batch->dir == USB_DIRECTION_IN) {
+                assert(batch->transfered_size <= batch->buffer_size);
+                memcpy(batch->buffer,
+                    uhci_transfer_batch_data_buffer(uhci_batch),
+                    batch->transfered_size);
+        }
+
         return true;
 }

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -98 +98 @@
 }
 
-/** Aborts the batch.
- * Sets error to EINTR and size off transferd data to 0, before finishing the
- * batch.
- * @param uhci_batch Batch to abort.
- */
-static inline void uhci_transfer_batch_abort(uhci_transfer_batch_t *uhci_batch)
-{
-        assert(uhci_batch);
-        uhci_batch->base.error = EINTR;
-        uhci_batch->base.transfered_size = 0;
-        usb_transfer_batch_finish(&uhci_batch->base);
-}
-
 /** Linked list conversion wrapper.
  * @param l Linked list link.