Changeset 31cca4f3 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-23T18:37:53Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

e160bfe8

Parents:

81487c4a

Message:

Corrected deadlock in IPC between USB remote interface and usbdev driver. Extracted creation of input context. Now issuing drop endpoint command when the endpoint is removed.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (2 diffs)

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

@@ -315 +315 @@
         }
 
+        /* 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->base.fun))) {
@@ -321 +323 @@
         }
 
-        /* FIXME:
-         * A deadlock happens on the previous line. For some reason, the HID driver
-         * does not fully release its DDF function (tracked it down to release_endpoint
-         * in usb_remote.c so far).
-         *
-         * For that reason as well, the following 3 lines are untested.
-         */
-
-        xhci_bus_remove_device(&rh->hc->bus, rh->hc, &dev->base);
-        hc_disable_slot(rh->hc, dev->slot_id);
+        // TODO: Remove EP0.
+        // TODO: Deconfigure device.
+
+        /* Remove device from XHCI bus. */
+        if ((err = xhci_bus_remove_device(&rh->hc->bus, rh->hc, &dev->base))) {
+                usb_log_warning("Failed to remove device '%s' from XHCI bus: %s",
+                    ddf_fun_get_name(dev->base.fun), str_error(err));
+        }
+
+        /* Disable device slot. */
+        if ((err = hc_disable_slot(rh->hc, dev->slot_id))) {
+                usb_log_warning("Failed to disable slot for device '%s': %s",
+                    ddf_fun_get_name(dev->base.fun), str_error(err));
+        }
+
+        /* Destroy DDF device. */
         hcd_ddf_device_destroy(&dev->base);