Changeset 53db806 in mainline

Timestamp:

2017-12-10T22:42:44Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7d957b2

Parents:

889146e

Message:

xhci bus: fix setup of FS device

Location:

uspace

Files:

• drv/bus/usb/xhci/bus.c (modified) (2 diffs)
• lib/usbhost/src/bus.c (modified) (1 diff)

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

@@ -180 +180 @@
         }
 
-        fibril_mutex_lock(&bus->base.guard);
         /* Assign an address to the device */
         if ((err = address_device(hc, xhci_dev))) {
@@ -187 +186 @@
         }
 
+        /* Setup EP0 might already need to issue a transfer. */
+        fibril_mutex_lock(&bus->base.guard);
+        assert(bus->devices_by_slot[xhci_dev->slot_id] == NULL);
+        bus->devices_by_slot[xhci_dev->slot_id] = xhci_dev;
+        fibril_mutex_unlock(&bus->base.guard);
+
         if ((err = setup_ep0_packet_size(hc, xhci_dev))) {
                 usb_log_error("Failed to setup control endpoint of the new device: %s", str_error(err));
                 goto err_address;
         }
-
-        assert(bus->devices_by_slot[xhci_dev->slot_id] == NULL);
-        bus->devices_by_slot[xhci_dev->slot_id] = xhci_dev;
-        fibril_mutex_unlock(&bus->base.guard);
 
         /* Read the device descriptor, derive the match ids */

uspace/lib/usbhost/src/bus.c

@@ -131 +131 @@
         assert(device);
 
-        fibril_mutex_lock(&bus->guard);
-
         if (desc->max_packet_size == 0 || desc->packets == 0) {
                 usb_log_warning("Invalid endpoint description (mps %zu, %u packets)", desc->max_packet_size, desc->packets);
                 return EINVAL;
         }
+
+        fibril_mutex_lock(&bus->guard);
 
         int err = ENOMEM;