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

Timestamp:

2018-01-17T17:55:35Z (8 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/hc.c (modified) (3 diffs)

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

@@ -173 +173 @@
             + EHCI_RD8(instance->caps->caplength));
 
-        list_initialize(&instance->pending_batches);
+        list_initialize(&instance->pending_endpoints);
         fibril_mutex_initialize(&instance->guard);
         fibril_condvar_initialize(&instance->async_doorbell);
@@ -299 +299 @@
         }
 
+        endpoint_t * const ep = batch->ep;
+        ehci_endpoint_t * const ehci_ep = ehci_endpoint_get(ep);
+
+        /* creating local reference */
+        endpoint_add_ref(ep);
+
+        fibril_mutex_lock(&ep->guard);
+        endpoint_activate_locked(ep, batch);
+
         ehci_transfer_batch_t *ehci_batch = ehci_transfer_batch_get(batch);
-
         const int err = ehci_transfer_batch_prepare(ehci_batch);
-        if (err)
+        if (err) {
+                endpoint_deactivate_locked(ep);
+                fibril_mutex_unlock(&ep->guard);
+                /* dropping local reference */
+                endpoint_del_ref(ep);
                 return err;
-
+        }
+
+        usb_log_debug("HC(%p): Committing BATCH(%p)", hc, batch);
+        ehci_transfer_batch_commit(ehci_batch);
+        fibril_mutex_unlock(&ep->guard);
+
+        /* Enqueue endpoint to the checked list */
         fibril_mutex_lock(&hc->guard);
         usb_log_debug2("HC(%p): Appending BATCH(%p)", hc, batch);
-        list_append(&ehci_batch->link, &hc->pending_batches);
-        usb_log_debug("HC(%p): Committing BATCH(%p)", hc, batch);
-        ehci_transfer_batch_commit(ehci_batch);
-
+
+        /* local reference -> pending list reference */
+        list_append(&ehci_ep->pending_link, &hc->pending_endpoints);
         fibril_mutex_unlock(&hc->guard);
+
         return EOK;
 }
@@ -341 +359 @@
 
         if (status & (USB_STS_IRQ_FLAG | USB_STS_ERR_IRQ_FLAG)) {
+
+                LIST_INITIALIZE(completed);
+
                 fibril_mutex_lock(&hc->guard);
 
-                usb_log_debug2("HC(%p): Scanning %lu pending batches", hc,
-                        list_count(&hc->pending_batches));
-                list_foreach_safe(hc->pending_batches, current, next) {
-                        ehci_transfer_batch_t *batch =
-                            ehci_transfer_batch_from_link(current);
+                usb_log_debug2("HC(%p): Scanning %lu pending endpoints", hc,
+                        list_count(&hc->pending_endpoints));
+                list_foreach_safe(hc->pending_endpoints, current, next) {
+                        ehci_endpoint_t *ep
+                                = list_get_instance(current, ehci_endpoint_t, pending_link);
+
+                        fibril_mutex_lock(&ep->base.guard);
+                        ehci_transfer_batch_t *batch
+                                = ehci_transfer_batch_get(ep->base.active_batch);
+                        assert(batch);
 
                         if (ehci_transfer_batch_check_completed(batch)) {
+                                endpoint_deactivate_locked(&ep->base);
                                 list_remove(current);
+                                endpoint_del_ref(&ep->base);
                                 usb_transfer_batch_finish(&batch->base);
                         }
+                        fibril_mutex_unlock(&ep->base.guard);
                 }
                 fibril_mutex_unlock(&hc->guard);
+
+
         }