Changeset 0892663a in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2018-01-11T04:14:37Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9848c77

Parents:

bad4a05

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 03:59:03)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:14:37)

Message:

usbhost: device removal and off/onlining moved into the library

Also, it is just not possible to make generic transfer abortion. So the
current semantics of endpoint unregistering is also aborting the pending
transfer. As it is not yet implemented in XHCI, and the stub in UHCI is
missing the magic, it breaks offlining interrupt devices, such as mouse.

When finishing this commit, I came across the fact we need some more
synchronization above device. Guard can protect internal structures, but
it cannot synchronize multiple calls to offline, or offline & removal
between each other - they both need to allow driver to unregister
endpoints, and as such must release the guard.

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)

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

@@ -64 +64 @@
 }
 
+/**
+ * Abort a transfer that is currently running.
+ * Call with endpoint guard locked.
+ */
+void uhci_transfer_batch_abort(uhci_transfer_batch_t *batch)
+{
+        assert(batch);
+
+        endpoint_t *ep = batch->base.ep;
+        assert(ep);
+        assert(fibril_mutex_is_locked(&ep->guard));
+        assert(ep->active_batch == &batch->base);
+
+        /*
+         * TODO: Do some magic here to remove the batch from schedule.
+         */
+
+        /*
+         * Wait for 2 frames. If the transfer was being processed,
+         * it shall be marked as finished already after 1ms.
+         */
+        endpoint_wait_timeout_locked(ep, 2000);
+        if (ep->active_batch != &batch->base)
+                return;
+
+        /*
+         * Now, we can be sure the transfer is not scheduled,
+         * and as such will not be completed. We now own the batch.
+         */
+        endpoint_deactivate_locked(ep);
+
+        /* Leave the critical section for finishing the batch. */
+        fibril_mutex_unlock(&ep->guard);
+
+        batch->base.error = EINTR;
+        batch->base.transfered_size = 0;
+        usb_transfer_batch_finish(&batch->base);
+
+        fibril_mutex_lock(&ep->guard);
+}
+
 /** Allocate memory and initialize internal data structure.
  *