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

uspace/drv/bus/usb/xhci/bus.c

@@ -209 +209 @@
         xhci_device_t *xhci_dev = xhci_device_get(dev);
 
-        /* Block creation of new endpoints and transfers. */
-        usb_log_debug2("Device " XHCI_DEV_FMT " going offline.", XHCI_DEV_ARGS(*xhci_dev));
-        fibril_mutex_lock(&dev->guard);
-        dev->online = false;
-        fibril_mutex_unlock(&dev->guard);
-
-        /* Abort running transfers. */
-        usb_log_debug2("Aborting all active transfers to device " XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*xhci_dev));
-        for (usb_endpoint_t i = 0; i < USB_ENDPOINT_MAX; ++i) {
-                xhci_endpoint_t *ep = xhci_device_get_endpoint(xhci_dev, i);
-                if (!ep)
-                        continue;
-
-                endpoint_abort(&ep->base);
-        }
-
-        /* TODO: Figure out how to handle errors here. So far, they are reported and skipped. */
-
-        /* Make DDF (and all drivers) forget about the device. */
-        if ((err = ddf_fun_unbind(dev->fun))) {
-                usb_log_warning("Failed to unbind DDF function of device " XHCI_DEV_FMT ": %s",
-                    XHCI_DEV_ARGS(*xhci_dev), str_error(err));
-        }
-
         /* Disable the slot, dropping all endpoints. */
         const uint32_t slot_id = xhci_dev->slot_id;
@@ -241 +217 @@
 
         bus->devices_by_slot[slot_id] = NULL;
-
-        /* Unregister remaining endpoints, freeing memory. */
-        for (usb_endpoint_t i = 0; i < USB_ENDPOINT_MAX; ++i) {
-                if (!dev->endpoints[i])
-                        continue;
-
-                bus_endpoint_remove(dev->endpoints[i]);
-        }
-
-        /* Destroy DDF device. */
-        /* XXX: Not a good idea, this method should not destroy devices. */
-        hcd_ddf_fun_destroy(dev);
 }
 
@@ -273 +237 @@
         if ((err = hc_configure_device(bus->hc, dev->slot_id))) {
                 usb_log_warning("Failed to configure device " XHCI_DEV_FMT ".", XHCI_DEV_ARGS(*dev));
-        }
-
-        /* Allow creation of new endpoints and transfers. */
-        usb_log_debug2("Device " XHCI_DEV_FMT " going online.", XHCI_DEV_ARGS(*dev));
-        fibril_mutex_lock(&dev_base->guard);
-        dev_base->online = true;
-        fibril_mutex_unlock(&dev_base->guard);
-
-        if ((err = ddf_fun_online(dev_base->fun))) {
                 return err;
         }
@@ -294 +249 @@
  * Bus callback.
  */
-static int device_offline(device_t *dev_base)
+static void device_offline(device_t *dev_base)
 {
         int err;
@@ -303 +258 @@
         xhci_device_t *dev = xhci_device_get(dev_base);
         assert(dev);
-
-        /* Tear down all drivers working with the device. */
-        if ((err = ddf_fun_offline(dev_base->fun))) {
-                return err;
-        }
-
-        /* Block creation of new endpoints and transfers. */
-        usb_log_debug2("Device " XHCI_DEV_FMT " going offline.", XHCI_DEV_ARGS(*dev));
-        fibril_mutex_lock(&dev_base->guard);
-        dev_base->online = false;
-        fibril_mutex_unlock(&dev_base->guard);
-
-        /* We will need the endpoint array later for DS deallocation. */
-        endpoint_t *endpoints[USB_ENDPOINT_MAX];
-        memcpy(endpoints, dev->base.endpoints, sizeof(endpoints));
-
-        for (usb_endpoint_t i = 1; i < USB_ENDPOINT_MAX; ++i) {
-                /* FIXME: Asserting here that the endpoint is not active. If not, EBUSY? */
-                dev->base.endpoints[i] = NULL;
-        }
 
         /* Issue one HC command to simultaneously drop all endpoints except zero. */
@@ -329 +264 @@
                     XHCI_DEV_ARGS(*dev));
         }
-
-        /* Tear down TRB ring / PSA. */
-        for (unsigned i = 1; i < ARRAY_SIZE(endpoints); ++i) {
-                if (!endpoints[i])
-                        continue;
-
-                /* Bus reference */
-                endpoint_del_ref(endpoints[i]);
-        }
-
-        return EOK;
 }
 
@@ -378 +302 @@
 
 /**
- * Register an andpoint to the bus. Allocate its transfer ring(s) and inform
- * xHC about it.
+ * Register an andpoint to the xHC.
  *
  * Bus callback.
  */
 static int endpoint_register(endpoint_t *ep_base)
-{
-        int err;
-        xhci_bus_t *bus = bus_to_xhci_bus(endpoint_get_bus(ep_base));
-        xhci_endpoint_t *ep = xhci_endpoint_get(ep_base);
-
-        xhci_device_t *dev = xhci_device_get(ep_base->device);
-
-        usb_log_info("Endpoint " XHCI_EP_FMT " registered to XHCI bus.", XHCI_EP_ARGS(*ep));
-
-        xhci_ep_ctx_t ep_ctx;
-        xhci_setup_endpoint_context(ep, &ep_ctx);
-
-        if ((err = hc_add_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx)))
-                return err;
-
-        return EOK;
-}
-
-/**
- * Unregister an endpoint. If the device is still available, inform the xHC
- * about it. Destroy resources allocated when registering.
- *
- * Bus callback.
- */
-static void endpoint_unregister(endpoint_t *ep_base)
 {
         int err;
@@ -415 +313 @@
         xhci_device_t *dev = xhci_device_get(ep_base->device);
 
-        usb_log_info("Endpoint " XHCI_EP_FMT " unregistered from XHCI bus.", XHCI_EP_ARGS(*ep));
+        xhci_ep_ctx_t ep_ctx;
+        xhci_setup_endpoint_context(ep, &ep_ctx);
+
+        if ((err = hc_add_endpoint(bus->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx)))
+                return err;
+
+        return EOK;
+}
+
+/**
+ * Unregister an endpoint. If the device is still available, inform the xHC
+ * about it.
+ *
+ * Bus callback.
+ */
+static void endpoint_unregister(endpoint_t *ep_base)
+{
+        int err;
+        xhci_bus_t *bus = bus_to_xhci_bus(endpoint_get_bus(ep_base));
+        xhci_endpoint_t *ep = xhci_endpoint_get(ep_base);
+        xhci_device_t *dev = xhci_device_get(ep_base->device);
 
         /* If device slot is still available, drop the endpoint. */