Changeset 2cf28b9 in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2017-10-25T15:22:45Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

62558202

Parents:

f668d60

Message:

xhci: connecting devices deeper than to roothub

It still does not work, because the address command fails, but there should not be any fundamental problem.

File:

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

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

@@ -45 +45 @@
 #include <stdbool.h>
 
+#include "hc.h"
 #include "bus.h"
 #include "endpoint.h"
@@ -136 +137 @@
         }
 
+        /* Calculate route string */
+        xhci_device_t *xhci_hub = xhci_device_get(dev->hub);
+        xhci_dev->tier = xhci_hub->tier + 1;
+        xhci_dev->route_str = xhci_hub->route_str;
+
+        /* Roothub port is not part of the route string */
+        if (xhci_dev->tier >= 2) {
+                const unsigned offset = 4 * (xhci_dev->tier - 2);
+                xhci_dev->route_str |= (dev->port & 0xf) << offset;
+        }
+
+        fibril_mutex_lock(&bus->base.guard);
         /* Assign an address to the device */
         if ((err = address_device(hc, xhci_dev))) {
@@ -147 +160 @@
         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 */
@@ -305 +319 @@
 }
 
+static int request_address(bus_t *bus_base, usb_address_t *addr, bool strict, usb_speed_t speed)
+{
+        assert(addr);
+
+        if (*addr != USB_ADDRESS_DEFAULT)
+                /* xHCI does not allow software to assign addresses. */
+                return ENOTSUP;
+
+        assert(strict);
+
+        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
+
+        if (xhci_bus->default_address_speed != USB_SPEED_MAX)
+                /* Already allocated */
+                return ENOENT;
+
+        xhci_bus->default_address_speed = speed;
+        return EOK;
+}
+
+static int release_address(bus_t *bus_base, usb_address_t addr)
+{
+        if (addr != USB_ADDRESS_DEFAULT)
+                return ENOTSUP;
+
+        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
+
+        xhci_bus->default_address_speed = USB_SPEED_MAX;
+        return EOK;
+}
+
 static usb_transfer_batch_t *create_batch(bus_t *bus, endpoint_t *ep)
 {
@@ -327 +372 @@
         .find_endpoint = find_endpoint,
 
-        .request_address = NULL,
-        .release_address = NULL,
+        .request_address = request_address,
+        .release_address = release_address,
         .reset_toggle = reset_toggle,
 
@@ -351 +396 @@
 
         bus->base.ops = xhci_bus_ops;
+        bus->default_address_speed = USB_SPEED_MAX;
         return EOK;
 }