Changeset 9620a54 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-10-29T10:51:59Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

d33dc780

Parents:

62f8025

Message:

Small changes. Temporarily fixed no device problem for endpoint logging. Added similar macro for device logging. Changed log messages to adopt these macros. TRB rings can be freed again. Made ring finalizers noexcept. Upon detach, the entire slot is disabled prior to unregistering endpoints in order to prevent invalid HC commands. Removed active endpoints count from XHCI device. Device context is freed in HC, so DCBAA is not touched from anywhere else.

File:

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

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

@@ -617 +617 @@
 }
 
-int hc_disable_slot(xhci_hc_t *hc, uint32_t slot_id)
-{
+int hc_disable_slot(xhci_hc_t *hc, xhci_device_t *dev)
+{
+        int err;
         assert(hc);
-        return xhci_cmd_sync_inline(hc, DISABLE_SLOT, .slot_id = slot_id);
+
+        if ((err = xhci_cmd_sync_inline(hc, DISABLE_SLOT, .slot_id = dev->slot_id))) {
+                return err;
+        }
+
+        /* Free the device context. */
+        hc->dcbaa[dev->slot_id] = 0;
+        if (dev->dev_ctx) {
+                free32(dev->dev_ctx);
+                dev->dev_ctx = NULL;
+        }
+
+        /* Mark the slot as invalid. */
+        dev->slot_id = 0;
+
+        return EOK;
 }
 
@@ -654 +670 @@
          * we have to rely on reverse mapping on others. */
         if (!hc->speed_to_psiv[dev->base.speed]) {
-                usb_log_error("Device reported an usb speed that cannot be mapped to HC port speed.");
+                usb_log_error("Device reported an USB speed that cannot be mapped to HC port speed.");
                 return EINVAL;
         }