Changeset 0892663a in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2018-01-11T04:14:37Z (7 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/lib/usbhost/src/ddf_helpers.c (modified) (3 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -336 +336 @@
         assert(device);
 
-        hc_device_t *hcd = dev_to_hcd(device);
-        assert(hcd);
-        assert(hcd->bus);
+        device_t *victim = NULL;
 
         fibril_mutex_lock(&hub->guard);
-
-        device_t *victim = NULL;
-
         list_foreach(hub->devices, link, device_t, it) {
                 if (it->port == port) {
@@ -350 +345 @@
                 }
         }
-        if (victim) {
-                assert(victim->fun);
-                assert(victim->port == port);
-                assert(victim->hub == hub);
-                list_remove(&victim->link);
-                fibril_mutex_unlock(&hub->guard);
-                const int ret = ddf_fun_unbind(victim->fun);
-                if (ret == EOK) {
-                        bus_device_remove(victim);
-                        ddf_fun_destroy(victim->fun);
-                } else {
-                        usb_log_warning("Failed to unbind device `%s': %s\n",
-                            ddf_fun_get_name(victim->fun), str_error(ret));
-                }
-                return EOK;
-        }
         fibril_mutex_unlock(&hub->guard);
-        return ENOENT;
+
+        if (!victim)
+                return ENOENT;
+
+        assert(victim->fun);
+        assert(victim->port == port);
+        assert(victim->hub == hub);
+
+        bus_device_remove(victim);
+        return EOK;
 }
 
@@ -477 +465 @@
         }
 
-        fibril_mutex_lock(&hub->guard);
-        list_append(&dev->link, &hub->devices);
-        fibril_mutex_unlock(&hub->guard);
-
         return EOK;