Changeset 8ad2b0a in mainline for uspace/drv/bus/usb/ehci/ehci_bus.c

Timestamp:

2018-01-17T17:55:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

94f8c363

Parents:

d60115a

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-17 17:54:41)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-17 17:55:35)

Message:

ehci: implement transfer abort on endpoint unregister

File:

• uspace/drv/bus/usb/ehci/ehci_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -77 +77 @@
         ehci_ep->qh = ehci_ep->dma_buffer.virt;
 
-        link_initialize(&ehci_ep->link);
+        link_initialize(&ehci_ep->eplist_link);
+        link_initialize(&ehci_ep->pending_link);
         return &ehci_ep->base;
 }
@@ -116 +117 @@
         bus_t *bus_base = endpoint_get_bus(ep);
         ehci_bus_t *bus = (ehci_bus_t *) bus_base;
+        hc_t *hc = bus->hc;
         assert(bus);
         assert(ep);
 
         usb2_bus_ops.endpoint_unregister(ep);
-        hc_dequeue_endpoint(bus->hc, ep);
+        hc_dequeue_endpoint(hc, ep);
+
+        ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
+
+        /*
+         * Now we can be sure the active transfer will not be completed. But first,
+         * make sure that the handling fibril won't use its link in pending list.
+         */
+        fibril_mutex_lock(&hc->guard);
+        if (link_in_use(&ehci_ep->pending_link))
+                /* pending list reference */
+                endpoint_del_ref(ep);
+        list_remove(&ehci_ep->pending_link);
+        fibril_mutex_unlock(&hc->guard);
+
+        /*
+         * Finally, the endpoint shall not be used anywhere else. Finish the
+         * pending batch.
+         */
+        fibril_mutex_lock(&ep->guard);
+        usb_transfer_batch_t * const batch = ep->active_batch;
+        endpoint_deactivate_locked(ep);
+        fibril_mutex_unlock(&ep->guard);
+
+        if (batch) {
+                batch->error = EINTR;
+                batch->transfered_size = 0;
+                usb_transfer_batch_finish(batch);
+        }
 }