Changeset 0892663a in mainline for uspace/drv/bus/usb/uhci/hc.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/drv/bus/usb/uhci/hc.c (modified) (3 diffs)

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

@@ -321 +321 @@
 }
 
-static int device_online(device_t *device)
-{
-        int err;
-        hc_t *instance = bus_to_hc(device->bus);
-        assert(instance);
-
-        /* Allow creation of new endpoints and transfers. */
-        usb_log_info("Device(%d): Going online.", device->address);
-        fibril_mutex_lock(&device->guard);
-        device->online = true;
-        fibril_mutex_unlock(&device->guard);
-
-        if ((err = ddf_fun_online(device->fun))) {
-                return err;
-        }
-
-        return EOK;
-}
-
-static int device_offline(device_t *device)
-{
-        int err;
-        hc_t *instance = bus_to_hc(device->bus);
-        assert(instance);
-
-        /* Tear down all drivers working with the device. */
-        if ((err = ddf_fun_offline(device->fun))) {
-                return err;
-        }
-
-        /* At this point, all drivers are assumed to have already terminated
-         * in a consistent way. The following code just cleans up hanging
-         * transfers if there are any. */
-
-        /* Block creation of new endpoints and transfers. */
-        usb_log_info("Device(%d): Going offline.", device->address);
-        fibril_mutex_lock(&device->guard);
-        device->online = false;
-        fibril_mutex_unlock(&device->guard);
-
-        /* Abort all transfers to all endpoints. */
-        transfer_list_abort_device(&instance->transfers_interrupt, device->address);
-        transfer_list_abort_device(&instance->transfers_control_slow, device->address);
-        transfer_list_abort_device(&instance->transfers_control_full, device->address);
-        transfer_list_abort_device(&instance->transfers_bulk_full, device->address);
-
-        return EOK;
+static void endpoint_unregister(endpoint_t *ep)
+{
+        usb2_bus_ops.endpoint_unregister(ep);
+
+        fibril_mutex_lock(&ep->guard);
+        if (ep->active_batch) {
+                uhci_transfer_batch_t *ub = uhci_transfer_batch_get(ep->active_batch);
+                uhci_transfer_batch_abort(ub);
+
+                assert(ep->active_batch == NULL);
+        }
+        fibril_mutex_unlock(&ep->guard);
 }
 
@@ -379 +344 @@
         .status = hc_status,
 
+        .endpoint_unregister = endpoint_unregister,
         .endpoint_count_bw = bandwidth_count_usb11,
+
         .batch_create = create_transfer_batch,
         .batch_schedule = hc_schedule,
         .batch_destroy = destroy_transfer_batch,
-
-        .device_online = device_online,
-        .device_offline = device_offline,
 };
 
@@ -522 +486 @@
 static int hc_schedule(usb_transfer_batch_t *batch)
 {
+        assert(batch);
         hc_t *instance = bus_to_hc(endpoint_get_bus(batch->ep));
-        assert(batch);
 
         if (batch->target.address == uhci_rh_get_address(&instance->rh))