Changes in uspace/drv/bus/usb/uhci/uhci.c [e991937:7de1988c] in mainline

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (5 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -34 +34 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <errno.h>
+#include <stdbool.h>
 #include <str_error.h>
 #include <ddf/interrupt.h>
+#include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <usb/debug.h>
-#include <usb/host/hcd.h>
-#include <usb/host/ddf_helpers.h>
 
 #include "uhci.h"
@@ -45 +49 @@
 #include "res.h"
 #include "hc.h"
-
+#include "root_hub.h"
+
+/** Structure representing both functions of UHCI hc, USB host controller
+ * and USB root hub */
+typedef struct uhci {
+        /** Pointer to DDF representation of UHCI host controller */
+        ddf_fun_t *hc_fun;
+        /** Pointer to DDF representation of UHCI root hub */
+        ddf_fun_t *rh_fun;
+
+        /** Internal driver's representation of UHCI host controller */
+        hc_t hc;
+        /** Internal driver's representation of UHCI root hub */
+        rh_t rh;
+} uhci_t;
+
+static inline uhci_t *dev_to_uhci(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
+}
 
 /** IRQ handling callback, forward status from call to diver structure.
@@ -56 +79 @@
 {
         assert(dev);
-        hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+        uhci_t *uhci = dev_to_uhci(dev);
+        if (!uhci) {
                 usb_log_error("Interrupt on not yet initialized device.\n");
                 return;
         }
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
-}
+        hc_interrupt(&uhci->hc, status);
+}
+
+/** Operations supported by the HC driver */
+static ddf_dev_ops_t hc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
+};
+
+/** Gets handle of the respective hc.
+ *
+ * @param[in] fun DDF function of uhci device.
+ * @param[out] handle Host cotnroller handle.
+ * @return Error code.
+ */
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
+{
+        ddf_fun_t *hc_fun = dev_to_uhci(ddf_fun_get_dev(fun))->hc_fun;
+        assert(hc_fun);
+
+        if (handle != NULL)
+                *handle = ddf_fun_get_handle(hc_fun);
+        return EOK;
+}
+
+/** USB interface implementation used by RH */
+static usb_iface_t usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle,
+};
+
+/** Get root hub hw resources (I/O registers).
+ *
+ * @param[in] fun Root hub function.
+ * @return Pointer to the resource list used by the root hub.
+ */
+static hw_resource_list_t *get_resource_list(ddf_fun_t *fun)
+{
+        rh_t *rh = ddf_fun_data_get(fun);
+        assert(rh);
+        return &rh->resource_list;
+}
+
+/** Interface to provide the root hub driver with hw info */
+static hw_res_ops_t hw_res_iface = {
+        .get_resource_list = get_resource_list,
+        .enable_interrupt = NULL,
+};
+
+/** RH function support for uhci_rhd */
+static ddf_dev_ops_t rh_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface,
+        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
+};
 
 /** Initialize hc and rh DDF structures and their respective drivers.
@@ -77 +150 @@
 int device_setup_uhci(ddf_dev_t *device)
 {
+        bool ih_registered = false;
+        bool hc_inited = false;
+        bool fun_bound = false;
+        int rc;
+
         if (!device)
                 return EBADMEM;
 
-#define CHECK_RET_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        return ret; \
-} else (void)0
-
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        uhci_t *instance = ddf_dev_data_alloc(device, sizeof(uhci_t));
+        if (instance == NULL) {
+                usb_log_error("Failed to allocate OHCI driver.\n");
+                return ENOMEM;
+        }
+
+        instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci_hc");
+        if (instance->hc_fun == NULL) {
+                usb_log_error("Failed to create UHCI HC function.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_ops(instance->hc_fun, &hc_ops);
+        ddf_fun_data_implant(instance->hc_fun, &instance->hc.generic);
+
+        instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");
+        if (instance->rh_fun == NULL) {
+                usb_log_error("Failed to create UHCI RH function.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_ops(instance->rh_fun, &rh_ops);
+        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
+
+        addr_range_t regs;
         int irq = 0;
 
-        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
-        CHECK_RET_RETURN(ret, "Failed to get I/O region for %" PRIun ": %s.\n",
-            ddf_dev_get_handle(device), str_error(ret));
-        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
-
-        const size_t ranges_count = hc_irq_pio_range_count();
-        const size_t cmds_count = hc_irq_cmd_count();
-        irq_pio_range_t irq_ranges[ranges_count];
-        irq_cmd_t irq_cmds[cmds_count];
-        ret = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
-        CHECK_RET_RETURN(ret, "Failed to generate IRQ commands: %s.\n",
-            str_error(ret));
-
-        irq_code_t irq_code = {
-                .rangecount = ranges_count,
-                .ranges = irq_ranges,
-                .cmdcount = cmds_count,
-                .cmds = irq_cmds
-        };
-
-        /* Register handler to avoid interrupt lockup */
-        ret = register_interrupt_handler(device, irq, irq_handler, &irq_code);
-        CHECK_RET_RETURN(ret, "Failed to register interrupt handler: %s.\n",
-            str_error(ret));
-        
-        ret = disable_legacy(device);
-        CHECK_RET_RETURN(ret, "Failed to disable legacy USB: %s.\n",
-            str_error(ret));
+        rc = get_my_registers(device, &regs, &irq);
+        if (rc != EOK) {
+                usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n",
+                    ddf_dev_get_handle(device), str_error(rc));
+                goto error;
+        }
+        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(regs), RNGSZ(regs), irq);
+
+        rc = disable_legacy(device);
+        if (rc != EOK) {
+                usb_log_error("Failed to disable legacy USB: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = hc_register_irq_handler(device, &regs, irq, irq_handler);
+        if (rc != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        ih_registered = true;
 
         bool interrupts = false;
-        ret = enable_interrupts(device);
-        if (ret != EOK) {
+        rc = enable_interrupts(device);
+        if (rc != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(ret));
+                    " Falling back to polling.\n", str_error(rc));
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
@@ -131 +222 @@
         }
 
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");
-        
-        hc_t *hc = malloc(sizeof(hc_t));
-        ret = hc ? EOK : ENOMEM;
-        CHECK_RET_RETURN(ret, "Failed to allocate UHCI HC structure.\n");
-
-        ret = hc_init(hc, (void*)reg_base, reg_size, interrupts);
-        CHECK_RET_RETURN(ret,
-            "Failed to init uhci_hcd: %s.\n", str_error(ret));
-
-        hcd_set_implementation(dev_to_hcd(device), hc, hc_schedule, NULL, NULL);
-
-        /*
-         * Creating root hub registers a new USB device so HC
-         * needs to be ready at this time.
-         */
-        ret = hcd_ddf_setup_root_hub(device);
-        if (ret != EOK) {
-                // TODO: Undo hcd_setup_device
-                hc_fini(hc);
-                CHECK_RET_RETURN(ret, "Failed to setup UHCI root hub: %s.\n",
-                    str_error(ret));
-                return ret;
+        rc = hc_init(&instance->hc, &regs, interrupts);
+        if (rc != EOK) {
+                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc));
+                goto error;
+        }
+
+        hc_inited = true;
+
+        rc = ddf_fun_bind(instance->hc_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind UHCI device function: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        fun_bound = true;
+
+        rc = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
+        if (rc != EOK) {
+                usb_log_error("Failed to add UHCI to HC class: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = rh_init(&instance->rh, instance->rh_fun,
+            (uintptr_t)instance->hc.registers + 0x10, 4);
+        if (rc != EOK) {
+                usb_log_error("Failed to setup UHCI root hub: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = ddf_fun_bind(instance->rh_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to register UHCI root hub: %s.\n",
+                    str_error(rc));
+                goto error;
         }
 
         return EOK;
+
+error:
+        if (fun_bound)
+                ddf_fun_unbind(instance->hc_fun);
+        if (hc_inited)
+                hc_fini(&instance->hc);
+        if (ih_registered)
+                unregister_interrupt_handler(device, irq);
+        if (instance->hc_fun != NULL)
+                ddf_fun_destroy(instance->hc_fun);
+        if (instance->rh_fun != NULL) {
+                ddf_fun_destroy(instance->rh_fun);
+        }
+        return rc;
 }
 /**