Changes in uspace/lib/usbhost/src/ddf_helpers.c [816f5f4:cccd60c3] in mainline

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (30 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -35 +35 @@
 
 #include <usb/classes/classes.h>
-#include <usb/host/bus.h>
 #include <usb/debug.h>
 #include <usb/descriptor.h>
@@ -47 +46 @@
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
-#include <devman.h>
 #include <errno.h>
 #include <fibril_synch.h>
 #include <macros.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -57 +56 @@
 #include "ddf_helpers.h"
 
+#define CTRL_PIPE_MIN_PACKET_SIZE 8
+
+typedef struct usb_dev {
+        link_t link;
+        list_t devices;
+        fibril_mutex_t guard;
+        ddf_fun_t *fun;
+        usb_address_t address;
+        usb_speed_t speed;
+        usb_address_t tt_address;
+        unsigned port;
+} usb_dev_t;
+
 typedef struct hc_dev {
         ddf_fun_t *ctl_fun;
         hcd_t hcd;
+        usb_dev_t *root_hub;
 } hc_dev_t;
 
@@ -78 +91 @@
 
 
-static int hcd_ddf_new_device(hcd_t *hcd, ddf_dev_t *hc, device_t *hub_dev, unsigned port);
-static int hcd_ddf_remove_device(ddf_dev_t *device, device_t *hub, unsigned port);
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
 
 
@@ -86 +99 @@
 /** Register endpoint interface function.
  * @param fun DDF function.
- * @param endpoint_desc Endpoint description.
+ * @param address USB address of the device.
+ * @param endpoint USB endpoint number to be registered.
+ * @param transfer_type Endpoint's transfer type.
+ * @param direction USB communication direction the endpoint is capable of.
+ * @param max_packet_size Maximu size of packets the endpoint accepts.
+ * @param interval Preferred timeout between communication.
  * @return Error code.
  */
 static int register_endpoint(
-        ddf_fun_t *fun, usb_endpoint_desc_t *endpoint_desc)
+    ddf_fun_t *fun, usb_endpoint_t endpoint,
+    usb_transfer_type_t transfer_type, usb_direction_t direction,
+    size_t max_packet_size, unsigned packets, unsigned interval)
 {
         assert(fun);
         hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        device_t *dev = ddf_fun_data_get(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
         assert(hcd);
-        assert(hcd->bus);
         assert(dev);
-
-        const size_t size = endpoint_desc->max_packet_size;
+        const size_t size = max_packet_size;
+        const usb_target_t target =
+            {{.address = dev->address, .endpoint = endpoint}};
 
         usb_log_debug("Register endpoint %d:%d %s-%s %zuB %ums.\n",
-                dev->address, endpoint_desc->endpoint_no,
-                usb_str_transfer_type(endpoint_desc->transfer_type),
-                usb_str_direction(endpoint_desc->direction),
-                endpoint_desc->max_packet_size, endpoint_desc->usb2.polling_interval);
-
-        return bus_add_ep(hcd->bus, dev, endpoint_desc->endpoint_no,
-                endpoint_desc->direction, endpoint_desc->transfer_type,
-                endpoint_desc->max_packet_size, endpoint_desc->packets,
-                size);
-}
-
- /** Unregister endpoint interface function.
-  * @param fun DDF function.
-  * @param endpoint_desc Endpoint description.
-  * @return Error code.
-  */
+            dev->address, endpoint, usb_str_transfer_type(transfer_type),
+            usb_str_direction(direction), max_packet_size, interval);
+
+        return hcd_add_ep(hcd, target, direction, transfer_type,
+            max_packet_size, packets, size, dev->tt_address, dev->port);
+}
+
+/** Unregister endpoint interface function.
+ * @param fun DDF function.
+ * @param address USB address of the endpoint.
+ * @param endpoint USB endpoint number.
+ * @param direction Communication direction of the enpdoint to unregister.
+ * @return Error code.
+ */
 static int unregister_endpoint(
-        ddf_fun_t *fun, usb_endpoint_desc_t *endpoint_desc)
+    ddf_fun_t *fun, usb_endpoint_t endpoint, usb_direction_t direction)
 {
         assert(fun);
         hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        device_t *dev = ddf_fun_data_get(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
         assert(hcd);
-        assert(hcd->bus);
         assert(dev);
-
-        const usb_target_t target = {{
-                .address = dev->address,
-                .endpoint = endpoint_desc->endpoint_no
-        }};
-
+        const usb_target_t target =
+            {{.address = dev->address, .endpoint = endpoint}};
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
-                dev->address, endpoint_desc->endpoint_no,
-                usb_str_direction(endpoint_desc->direction));
-        return bus_remove_ep(hcd->bus, target, endpoint_desc->direction);
+            dev->address, endpoint, usb_str_direction(direction));
+        return hcd_remove_ep(hcd, target, direction);
 }
 
@@ -143 +155 @@
         assert(fun);
         hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        device_t *dev = ddf_fun_data_get(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
         assert(hcd);
-        assert(hcd->bus);
         assert(dev);
 
         usb_log_debug("Device %d requested default address at %s speed\n",
             dev->address, usb_str_speed(speed));
-        return bus_reserve_default_address(hcd->bus, speed);
+        return hcd_reserve_default_address(hcd, speed);
 }
 
@@ -157 +168 @@
         assert(fun);
         hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        device_t *dev = ddf_fun_data_get(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
         assert(hcd);
-        assert(hcd->bus);
         assert(dev);
 
         usb_log_debug("Device %d released default address\n", dev->address);
-        return bus_release_default_address(hcd->bus);
+        return hcd_release_default_address(hcd);
 }
 
 static int device_enumerate(ddf_fun_t *fun, unsigned port)
-{
-        assert(fun);
-        ddf_dev_t *hc = ddf_fun_get_dev(fun);
-        assert(hc);
-        hcd_t *hcd = dev_to_hcd(hc);
-        assert(hcd);
-        device_t *hub = ddf_fun_data_get(fun);
-        assert(hub);
-
-        usb_log_debug("Hub %d reported a new USB device on port: %u\n",
-            hub->address, port);
-        return hcd_ddf_new_device(hcd, hc, hub, port);
-}
-
-static int device_remove(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
         ddf_dev_t *ddf_dev = ddf_fun_get_dev(fun);
-        device_t *dev = ddf_fun_data_get(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
+        assert(ddf_dev);
+        assert(dev);
+        usb_log_debug("Hub %d reported a new USB device on port: %u\n",
+            dev->address, port);
+        return hcd_ddf_new_device(ddf_dev, dev, port);
+}
+
+static int device_remove(ddf_fun_t *fun, unsigned port)
+{
+        assert(fun);
+        ddf_dev_t *ddf_dev = ddf_fun_get_dev(fun);
+        usb_dev_t *dev = ddf_fun_data_get(fun);
         assert(ddf_dev);
         assert(dev);
@@ -222 +229 @@
 {
         assert(fun);
-        device_t *dev = ddf_fun_data_get(fun);
-        assert(dev);
+        usb_dev_t *usb_dev = ddf_fun_data_get(fun);
+        assert(usb_dev);
         const usb_target_t target = {{
-            .address  = dev->address,
+            .address =  usb_dev->address,
             .endpoint = endpoint,
         }};
@@ -248 +255 @@
 {
         assert(fun);
-        device_t *dev = ddf_fun_data_get(fun);
-        assert(dev);
+        usb_dev_t *usb_dev = ddf_fun_data_get(fun);
+        assert(usb_dev);
         const usb_target_t target = {{
-            .address  = dev->address,
+            .address =  usb_dev->address,
             .endpoint = endpoint,
         }};
@@ -283 +290 @@
 
 /* DDF HELPERS */
+
+#define GET_DEVICE_DESC(size) \
+{ \
+        .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST \
+            | (USB_REQUEST_TYPE_STANDARD << 5) \
+            | USB_REQUEST_RECIPIENT_DEVICE, \
+        .request = USB_DEVREQ_GET_DESCRIPTOR, \
+        .value = uint16_host2usb(USB_DESCTYPE_DEVICE << 8), \
+        .index = uint16_host2usb(0), \
+        .length = uint16_host2usb(size), \
+};
+
+#define SET_ADDRESS(address) \
+{ \
+        .request_type = SETUP_REQUEST_TYPE_HOST_TO_DEVICE \
+            | (USB_REQUEST_TYPE_STANDARD << 5) \
+            | USB_REQUEST_RECIPIENT_DEVICE, \
+        .request = USB_DEVREQ_SET_ADDRESS, \
+        .value = uint16_host2usb(address), \
+        .index = uint16_host2usb(0), \
+        .length = uint16_host2usb(0), \
+};
+
+static int hcd_ddf_add_device(ddf_dev_t *parent, usb_dev_t *hub_dev,
+    unsigned port, usb_address_t address, usb_speed_t speed, const char *name,
+    const match_id_list_t *mids)
+{
+        assert(parent);
+
+        char default_name[10] = { 0 }; /* usbxyz-ss */
+        if (!name) {
+                snprintf(default_name, sizeof(default_name) - 1,
+                    "usb%u-%cs", address, usb_str_speed(speed)[0]);
+                name = default_name;
+        }
+
+        ddf_fun_t *fun = ddf_fun_create(parent, fun_inner, name);
+        if (!fun)
+                return ENOMEM;
+        usb_dev_t *info = ddf_fun_data_alloc(fun, sizeof(usb_dev_t));
+        if (!info) {
+                ddf_fun_destroy(fun);
+                return ENOMEM;
+        }
+        info->address = address;
+        info->speed = speed;
+        info->fun = fun;
+        info->port = port;
+        info->tt_address = hub_dev ? hub_dev->tt_address : -1;
+        link_initialize(&info->link);
+        list_initialize(&info->devices);
+        fibril_mutex_initialize(&info->guard);
+
+        if (hub_dev && hub_dev->speed == USB_SPEED_HIGH && usb_speed_is_11(speed))
+                info->tt_address = hub_dev->address;
+
+        ddf_fun_set_ops(fun, &usb_ops);
+        list_foreach(mids->ids, link, const match_id_t, mid) {
+                ddf_fun_add_match_id(fun, mid->id, mid->score);
+        }
+
+        int ret = ddf_fun_bind(fun);
+        if (ret != EOK) {
+                ddf_fun_destroy(fun);
+                return ret;
+        }
+
+        if (hub_dev) {
+                fibril_mutex_lock(&hub_dev->guard);
+                list_append(&info->link, &hub_dev->devices);
+                fibril_mutex_unlock(&hub_dev->guard);
+        } else {
+                hc_dev_t *hc_dev = dev_to_hc_dev(parent);
+                assert(hc_dev->root_hub == NULL);
+                hc_dev->root_hub = info;
+        }
+        return EOK;
+}
 
 #define ADD_MATCHID_OR_RETURN(list, sc, str, ...) \
@@ -309 +394 @@
         assert(l);
         assert(d);
-
+        
         if (d->vendor_id != 0) {
                 /* First, with release number. */
@@ -316 +401 @@
                     d->vendor_id, d->product_id, (d->device_version >> 8),
                     (d->device_version & 0xff));
-
+        
                 /* Next, without release number. */
                 ADD_MATCHID_OR_RETURN(l, 90, "usb&vendor=%#04x&product=%#04x",
@@ -330 +415 @@
 
         return EOK;
-}
-
-static int hcd_ddf_remove_device(ddf_dev_t *device, device_t *hub,
+
+}
+
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
     unsigned port)
 {
@@ -339 +425 @@
         hcd_t *hcd = dev_to_hcd(device);
         assert(hcd);
-        assert(hcd->bus);
 
         hc_dev_t *hc_dev = dev_to_hc_dev(device);
@@ -346 +431 @@
         fibril_mutex_lock(&hub->guard);
 
-        device_t *victim = NULL;
-
-        list_foreach(hub->devices, link, device_t, it) {
+        usb_dev_t *victim = NULL;
+
+        list_foreach(hub->devices, link, usb_dev_t, it) {
                 if (it->port == port) {
                         victim = it;
@@ -355 +440 @@
         }
         if (victim) {
-                assert(victim->fun);
                 assert(victim->port == port);
-                assert(victim->hub == hub);
                 list_remove(&victim->link);
                 fibril_mutex_unlock(&hub->guard);
@@ -363 +446 @@
                 if (ret == EOK) {
                         usb_address_t address = victim->address;
-                        bus_remove_device(hcd->bus, hcd, victim);
                         ddf_fun_destroy(victim->fun);
-                        bus_release_address(hcd->bus, address);
+                        hcd_release_address(hcd, address);
                 } else {
                         usb_log_warning("Failed to unbind device `%s': %s\n",
@@ -376 +458 @@
 }
 
-device_t *hcd_ddf_device_create(ddf_dev_t *hc, size_t device_size)
-{
-        /* Create DDF function for the new device */
-        ddf_fun_t *fun = ddf_fun_create(hc, fun_inner, NULL);
-        if (!fun)
-                return NULL;
-
-        ddf_fun_set_ops(fun, &usb_ops);
-
-        /* Create USB device node for the new device */
-        device_t *dev = ddf_fun_data_alloc(fun, device_size);
-        if (!dev) {
-                ddf_fun_destroy(fun);
-                return NULL;
-        }
-
-        device_init(dev);
-        dev->fun = fun;
-        return dev;
-}
-
-void hcd_ddf_device_destroy(device_t *dev)
-{
-        assert(dev);
-        assert(dev->fun);
-        ddf_fun_destroy(dev->fun);
-}
-
-int hcd_ddf_device_explore(hcd_t *hcd, device_t *device)
-{
-        int err;
-        match_id_list_t mids;
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port)
+{
+        assert(device);
+
+        hcd_t *hcd = dev_to_hcd(device);
+        assert(hcd);
+
+        usb_speed_t speed = USB_SPEED_MAX;
+
+        /* This checks whether the default address is reserved and gets speed */
+        int ret = usb_bus_get_speed(&hcd->bus, USB_ADDRESS_DEFAULT, &speed);
+        if (ret != EOK) {
+                usb_log_error("Failed to verify speed: %s.", str_error(ret));
+                return ret;
+        }
+
+        usb_log_debug("Found new %s speed USB device.", usb_str_speed(speed));
+
+        static const usb_target_t default_target = {{
+                .address = USB_ADDRESS_DEFAULT,
+                .endpoint = 0,
+        }};
+
+        const usb_address_t address = hcd_request_address(hcd, speed);
+        if (address < 0) {
+                usb_log_error("Failed to reserve new address: %s.",
+                    str_error(address));
+                return address;
+        }
+
+        usb_log_debug("Reserved new address: %d\n", address);
+
+        const usb_target_t target = {{
+                .address = address,
+                .endpoint = 0,
+        }};
+
+        const usb_address_t tt_address = hub ? hub->tt_address : -1;
+
+        /* Add default pipe on default address */
+        usb_log_debug("Device(%d): Adding default target(0:0)\n", address);
+        ret = hcd_add_ep(hcd,
+            default_target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
+            CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE, 1,
+            tt_address, port);
+        if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to add default target: %s.",
+                    address, str_error(ret));
+                hcd_release_address(hcd, address);
+                return ret;
+        }
+
+        /* Get max packet size for default pipe */
         usb_standard_device_descriptor_t desc = { 0 };
-
-        init_match_ids(&mids);
-
-        usb_target_t control_ep = {{
-                .address = device->address,
-                .endpoint = 0
-        }};
+        const usb_device_request_setup_packet_t get_device_desc_8 =
+            GET_DEVICE_DESC(CTRL_PIPE_MIN_PACKET_SIZE);
+
+        // TODO CALLBACKS
+        usb_log_debug("Device(%d): Requesting first 8B of device descriptor.",
+            address);
+        ssize_t got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_IN,
+            &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
+            "read first 8 bytes of dev descriptor");
+
+        if (got != CTRL_PIPE_MIN_PACKET_SIZE) {
+                ret = got < 0 ? got : EOVERFLOW;
+                usb_log_error("Device(%d): Failed to get 8B of dev descr: %s.",
+                    address, str_error(ret));
+                hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, address);
+                return ret;
+        }
+
+        /* Register EP on the new address */
+        usb_log_debug("Device(%d): Registering control EP.", address);
+        ret = hcd_add_ep(hcd, target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
+            ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
+            ED_MPS_TRANS_OPPORTUNITIES_GET(uint16_usb2host(desc.max_packet_size)),
+            ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
+            tt_address, port);
+        if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to register EP0: %s",
+                    address, str_error(ret));
+                hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
+                hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, address);
+                return ret;
+        }
+
+        /* Set new address */
+        const usb_device_request_setup_packet_t set_address =
+            SET_ADDRESS(target.address);
+
+        usb_log_debug("Device(%d): Setting USB address.", address);
+        got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_OUT,
+            NULL, 0, *(uint64_t *)&set_address, "set address");
+
+        usb_log_debug("Device(%d): Removing default (0:0) EP.", address);
+        hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);
+
+        if (got != 0) {
+                usb_log_error("Device(%d): Failed to set new address: %s.",
+                    address, str_error(got));
+                hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, address);
+                return got;
+        }
 
         /* Get std device descriptor */
@@ -422 +571 @@
 
         usb_log_debug("Device(%d): Requesting full device descriptor.",
-            device->address);
-        ssize_t got = hcd_send_batch_sync(hcd, control_ep, USB_DIRECTION_IN,
+            address);
+        got = hcd_send_batch_sync(hcd, target, USB_DIRECTION_IN,
             &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
             "read device descriptor");
-        if (got < 0) {
-                err = got < 0 ? got : EOVERFLOW;
+        if (ret != EOK) {
                 usb_log_error("Device(%d): Failed to set get dev descriptor: %s",
-                    device->address, str_error(err));
-                goto out;
+                    address, str_error(ret));
+                hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, target.address);
+                return ret;
         }
 
         /* Create match ids from the device descriptor */
-        usb_log_debug("Device(%d): Creating match IDs.", device->address);
-        if ((err = create_match_ids(&mids, &desc))) {
-                usb_log_error("Device(%d): Failed to create match ids: %s", device->address, str_error(err));
-                goto out;
-        }
-
-        list_foreach(mids.ids, link, const match_id_t, mid) {
-                ddf_fun_add_match_id(device->fun, mid->id, mid->score);
-        }
-
-out:
+        match_id_list_t mids;
+        init_match_ids(&mids);
+
+        usb_log_debug("Device(%d): Creating match IDs.", address);
+        ret = create_match_ids(&mids, &desc);
+        if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to create match ids: %s",
+                    address, str_error(ret));
+                hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, target.address);
+                return ret;
+        }
+
+        /* Register device */
+        usb_log_debug("Device(%d): Registering DDF device.", address);
+        ret = hcd_ddf_add_device(device, hub, port, address, speed, NULL, &mids);
         clean_match_ids(&mids);
-        return err;
-}
-
-static int hcd_ddf_new_device(hcd_t *hcd, ddf_dev_t *hc, device_t *hub, unsigned port)
-{
-        int err;
-        assert(hcd);
-        assert(hcd->bus);
-        assert(hub);
-        assert(hc);
-
-        device_t *dev = hcd_ddf_device_create(hc, hcd->bus->device_size);
-        if (!dev) {
-                usb_log_error("Failed to create USB device function.");
-                return ENOMEM;
-        }
-
-        dev->hub = hub;
-        dev->port = port;
-
-        if ((err = bus_enumerate_device(hcd->bus, hcd, dev))) {
-                usb_log_error("Failed to initialize USB dev memory structures.");
-                return err;
-        }
-
-        /* If the driver didn't name the dev when enumerating,
-         * do it in some generic way.
-         */
-        if (!ddf_fun_get_name(dev->fun)) {
-                device_set_default_name(dev);
-        }
-
-        if ((err = ddf_fun_bind(dev->fun))) {
-                usb_log_error("Device(%d): Failed to register: %s.", dev->address, str_error(err));
-                goto err_usb_dev;
-        }
-
-        fibril_mutex_lock(&hub->guard);
-        list_append(&dev->link, &hub->devices);
-        fibril_mutex_unlock(&hub->guard);
-
-        return EOK;
-
-err_usb_dev:
-        hcd_ddf_device_destroy(dev);
-        return err;
+        if (ret != EOK) {
+                usb_log_error("Device(%d): Failed to register: %s.",
+                    address, str_error(ret));
+                hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
+                hcd_release_address(hcd, target.address);
+        }
+
+        return ret;
 }
 
@@ -499 +616 @@
  * @return Error code
  */
-int hcd_setup_virtual_root_hub(hcd_t *hcd, ddf_dev_t *hc)
-{
-        int err;
-
-        assert(hc);
+int hcd_ddf_setup_root_hub(ddf_dev_t *device)
+{
+        assert(device);
+        hcd_t *hcd = dev_to_hcd(device);
         assert(hcd);
-        assert(hcd->bus);
-
-        if ((err = bus_reserve_default_address(hcd->bus, USB_SPEED_MAX))) {
-                usb_log_error("Failed to reserve default address for roothub setup: %s", str_error(err));
-                return err;
-        }
-
-        device_t *dev = hcd_ddf_device_create(hc, USB_SPEED_MAX);
-        if (!dev) {
-                usb_log_error("Failed to create function for the root hub.");
-                goto err_default_address;
-        }
-
-        ddf_fun_set_name(dev->fun, "roothub");
-
-        dev->tt = (usb_tt_address_t) {
-                .address = -1,
-                .port = 0,
-        };
-
-        /* Assign an address to the device */
-        if ((err = bus_enumerate_device(hcd->bus, hcd, dev))) {
-                usb_log_error("Failed to enumerate roothub device: %s", str_error(err));
-                goto err_usb_dev;
-        }
-
-        if ((err = ddf_fun_bind(dev->fun))) {
-                usb_log_error("Failed to register roothub: %s.", str_error(err));
-                goto err_usb_dev;
-        }
-
-        bus_release_default_address(hcd->bus);
-        return EOK;
-
-err_usb_dev:
-        hcd_ddf_device_destroy(dev);
-err_default_address:
-        bus_release_default_address(hcd->bus);
-        return err;
+
+        hcd_reserve_default_address(hcd, hcd->bus.max_speed);
+        const int ret = hcd_ddf_new_device(device, NULL, 0);
+        hcd_release_default_address(hcd);
+        return ret;
 }
 
@@ -556 +638 @@
  * This function does all the ddf work for hc driver.
  */
-int hcd_ddf_setup_hc(ddf_dev_t *device)
+int hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
+    size_t bw, bw_count_func_t bw_count)
 {
         assert(device);
@@ -565 +648 @@
                 return ENOMEM;
         }
-        hcd_init(&instance->hcd);
+        instance->root_hub = NULL;
+        hcd_init(&instance->hcd, max_speed, bw, bw_count);
 
         int ret = ENOMEM;
@@ -607 +691 @@
 }
 
-//TODO: Move this to generic ddf?
-/** Call the parent driver with a request to enable interrupts
+//TODO: Cache parent session in HCD
+/** Call the parent driver with a request to enable interrupt
  *
  * @param[in] device Device asking for interrupts
+ * @param[in] inum Interrupt number
  * @return Error code.
  */
-int hcd_ddf_enable_interrupts(ddf_dev_t *device)
-{
-        assert(device);
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(ddf_dev_get_handle(device),
-            IPC_FLAG_BLOCKING);
-        const bool enabled = hw_res_enable_interrupt(parent_sess);
-        async_hangup(parent_sess);
-
-        return enabled ? EOK : EIO;
-}
-
-//TODO: Move this to generic ddf?
+int hcd_ddf_enable_interrupt(ddf_dev_t *device, int inum)
+{
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
+                return EIO;
+
+        return hw_res_enable_interrupt(parent_sess, inum);
+}
+
+//TODO: Cache parent session in HCD
 int hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res)
 {
-        assert(device);
-        assert(hw_res);
-
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(ddf_dev_get_handle(device),
-            IPC_FLAG_BLOCKING);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
+                return EIO;
+
         hw_res_list_parsed_init(hw_res);
         const int ret = hw_res_get_list_parsed(parent_sess, hw_res, 0);
-        async_hangup(parent_sess);
         if (ret != EOK)
                 hw_res_list_parsed_clean(hw_res);
@@ -663 +742 @@
  * @param[in] gen_irq_code IRQ code generator.
  *
- * @return EOK on success or negative error code
+ * @return IRQ capability handle on success.
+ * @return Negative error code.
  */
 int hcd_ddf_setup_interrupts(ddf_dev_t *device,
     const hw_res_list_parsed_t *hw_res,
     interrupt_handler_t handler,
-    irq_code_gen_t gen_irq_code)
-{
+    int (*gen_irq_code)(irq_code_t *, const hw_res_list_parsed_t *hw_res))
+{
+
         assert(device);
-
-        hcd_t *hcd = dev_to_hcd(device);
-
         if (!handler || !gen_irq_code)
                 return ENOTSUP;
@@ -679 +757 @@
         irq_code_t irq_code = {0};
 
-        const int irq = gen_irq_code(&irq_code, hcd, hw_res);
+        const int irq = gen_irq_code(&irq_code, hw_res);
         if (irq < 0) {
                 usb_log_error("Failed to generate IRQ code: %s.\n",
@@ -687 +765 @@
 
         /* Register handler to avoid interrupt lockup */
-        int ret = register_interrupt_handler(device, irq, handler, &irq_code);
+        const int irq_cap = register_interrupt_handler(device, irq, handler,
+            &irq_code);
         irq_code_clean(&irq_code);
+        if (irq_cap < 0) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(irq_cap));
+                return irq_cap;
+        }
+
+        /* Enable interrupts */
+        int ret = hcd_ddf_enable_interrupt(device, irq);
         if (ret != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",
                     str_error(ret));
-                return ret;
-        }
-
-        /* Enable interrupts */
-        ret = hcd_ddf_enable_interrupts(device);
-        if (ret != EOK) {
-                usb_log_error("Failed to enable interrupts: %s.\n",
-                    str_error(ret));
-                unregister_interrupt_handler(device, irq);
-                return ret;
-        }
-        assert(irq > 0);
-        return irq;
+                unregister_interrupt_handler(device, irq_cap);
+                return ret;
+        }
+        return irq_cap;
 }
 
@@ -766 +844 @@
 {
         assert(driver);
+        static const struct { size_t bw; bw_count_func_t bw_count; }bw[] = {
+            [USB_SPEED_FULL] = { .bw = BANDWIDTH_AVAILABLE_USB11,
+                                 .bw_count = bandwidth_count_usb11 },
+            [USB_SPEED_HIGH] = { .bw = BANDWIDTH_AVAILABLE_USB11,
+                                 .bw_count = bandwidth_count_usb11 },
+        };
 
         int ret = EOK;
+        const usb_speed_t speed = driver->hc_speed;
+        if (speed >= ARRAY_SIZE(bw) || bw[speed].bw == 0) {
+                usb_log_error("Driver `%s' reported unsupported speed: %s",
+                    driver->name, usb_str_speed(speed));
+                return ENOTSUP;
+        }
 
         hw_res_list_parsed_t hw_res;
@@ -778 +868 @@
         }
 
-        ret = hcd_ddf_setup_hc(device);
+        ret = hcd_ddf_setup_hc(device, speed, bw[speed].bw, bw[speed].bw_count);
         if (ret != EOK) {
                 usb_log_error("Failed to setup generic HCD.\n");
-                goto err_hw_res;
-        }
-
-        hcd_t *hcd = dev_to_hcd(device);
-
-        if (driver->init)
-                ret = driver->init(hcd, &hw_res);
-        if (ret != EOK) {
-                usb_log_error("Failed to init HCD.\n");
-                goto err_hcd;
-        }
-
-        /* Setup interrupts  */
+                hw_res_list_parsed_clean(&hw_res);
+                return ret;
+        }
+
         interrupt_handler_t *irq_handler =
             driver->irq_handler ? driver->irq_handler : ddf_hcd_gen_irq_handler;
-        const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler, driver->irq_code_gen);
-        if (!(irq < 0)) {
+        const int irq_cap = hcd_ddf_setup_interrupts(device, &hw_res,
+            irq_handler, driver->irq_code_gen);
+        bool irqs_enabled = !(irq_cap < 0);
+        if (irqs_enabled) {
                 usb_log_debug("Hw interrupts enabled.\n");
         }
 
-        /* Claim the device from BIOS */
         if (driver->claim)
-                ret = driver->claim(hcd, device);
-        if (ret != EOK) {
-                usb_log_error("Failed to claim `%s' for driver `%s': %s",
-                    ddf_dev_get_name(device), driver->name, str_error(ret));
-                goto err_irq;
-        }
-
-        /* Start hw driver */
-        if (driver->start)
-                ret = driver->start(hcd, !(irq < 0));
-        if (ret != EOK) {
-                usb_log_error("Failed to start HCD: %s.\n", str_error(ret));
-                goto err_irq;
+                ret = driver->claim(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to claim `%s' for driver `%s'",
+                    ddf_dev_get_name(device), driver->name);
+                return ret;
+        }
+
+
+        /* Init hw driver */
+        hcd_t *hcd = dev_to_hcd(device);
+        ret = driver->init(hcd, &hw_res, irqs_enabled);
+        hw_res_list_parsed_clean(&hw_res);
+        if (ret != EOK) {
+                usb_log_error("Failed to init HCD: %s.\n", str_error(ret));
+                goto irq_unregister;
         }
 
         /* Need working irq replacement to setup root hub */
-        if ((irq < 0) && hcd->ops.status_hook) {
+        if (!irqs_enabled && hcd->ops.status_hook) {
                 hcd->polling_fibril = fibril_create(interrupt_polling, hcd);
                 if (hcd->polling_fibril == 0) {
                         usb_log_error("Failed to create polling fibril\n");
                         ret = ENOMEM;
-                        goto err_started;
+                        goto irq_unregister;
                 }
                 fibril_add_ready(hcd->polling_fibril);
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(irq));
+                    " Falling back to polling.\n", str_error(irq_cap));
         }
 
@@ -835 +919 @@
          * needs to be ready at this time.
          */
-        if (driver->setup_root_hub)
-                ret = driver->setup_root_hub(hcd, device);
+        ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
                 usb_log_error("Failed to setup HC root hub: %s.\n",
                     str_error(ret));
-                goto err_polling;
+                driver->fini(dev_to_hcd(device));
+irq_unregister:
+                /* Unregistering non-existent should be ok */
+                unregister_interrupt_handler(device, irq_cap);
+                hcd_ddf_clean_hc(device);
+                return ret;
         }
 
@@ -846 +934 @@
             driver->name, ddf_dev_get_name(device));
         return EOK;
-
-err_polling:
-        // TODO: Stop the polling fibril (refactor the interrupt_polling func)
-        //
-err_started:
-        if (driver->stop)
-                driver->stop(hcd);
-err_irq:
-        unregister_interrupt_handler(device, irq);
-        if (driver->fini)
-                driver->fini(hcd);
-err_hcd:
-        hcd_ddf_clean_hc(device);
-err_hw_res:
-        hw_res_list_parsed_clean(&hw_res);
-        return ret;
-}
-
+}
 /**
  * @}