Changeset 2755a622 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2018-01-17T01:36:46Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

740dafc

Parents:

3f44312

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-16 23:24:28)

git-committer:

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

Message:

uhci: fix transfer aborting

File:

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

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

@@ -329 +329 @@
         uhci_transfer_batch_t *batch = NULL;
 
+        // Check for the roothub, as it does not schedule into lists
+        if (ep->device->speed == USB_SPEED_MAX) {
+                // FIXME: We shall check the roothub for active transfer. But
+                // as it is polling, there is no way to make it stop doing so.
+                // Return after rewriting uhci rh.
+                return;
+        }
+
+        transfer_list_t *list = hc->transfers[ep->device->speed][ep->transfer_type];
+        assert(list);
+
+        // To avoid ABBA deadlock, we need to take the list first
+        fibril_mutex_lock(&list->guard);
         fibril_mutex_lock(&ep->guard);
         if (ep->active_batch) {
                 batch = uhci_transfer_batch_get(ep->active_batch);
-
-                transfer_list_t *list = hc->transfers[ep->device->speed][ep->transfer_type];
-                assert(list);
-
-                fibril_mutex_lock(&list->guard);
+                endpoint_deactivate_locked(ep);
                 transfer_list_remove_batch(list, batch);
-                fibril_mutex_unlock(&list->guard);
-
+        }
+        fibril_mutex_unlock(&ep->guard);
+        fibril_mutex_unlock(&list->guard);
+
+        if (batch) {
+                // The HW could have been looking at the batch.
+                // Better wait two frames before we release the buffers.
                 endpoint_wait_timeout_locked(ep, 2000);
-
-                batch = uhci_transfer_batch_get(ep->active_batch);
-                if (ep->active_batch) {
-                        endpoint_deactivate_locked(ep);
-                }
-        }
-        fibril_mutex_unlock(&ep->guard);
-
-        if (batch) {
                 batch->base.error = EINTR;
                 batch->base.transfered_size = 0;