Changes in uspace/drv/bus/usb/uhci/uhci.c [952bc66:5b89d43b] in mainline

File:

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

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

@@ -34 +34 @@
  */
 
-#include <assert.h>
-#include <ddf/driver.h>
-#include <ddf/interrupt.h>
-#include <device/hw_res_parsed.h>
-#include <device/pci.h>
-#include <devman.h>
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <errno.h>
 #include <stdbool.h>
-#include <stdlib.h>
 #include <str_error.h>
-#include <sys/types.h>
-
+#include <ddf/interrupt.h>
+#include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <usb/debug.h>
-#include <usb/usb.h>
-#include <usb/host/ddf_helpers.h>
-#include <usb/host/hcd.h>
-#include <usb/host/usb_bus.h>
 
 #include "uhci.h"
 
+#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.
@@ -66 +79 @@
 {
         assert(dev);
-        hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->driver.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->driver.data, status);
-}
-
-/** Call the PCI driver with a request to clear legacy support register
- *
- * @param[in] device Device asking to disable interrupts
+        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 disable_legacy(ddf_dev_t *device)
-{
-        assert(device);
-
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        /* See UHCI design guide page 45 for these values.
-         * Write all WC bits in USB legacy register */
-        const int rc = pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
-
-        async_hangup(parent_sess);
-        return rc;
-}
+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,
+};
+
+static pio_window_t *get_pio_window(ddf_fun_t *fun)
+{
+        rh_t *rh = ddf_fun_data_get(fun);
+        
+        if (rh == NULL)
+                return NULL;
+        return &rh->pio_window;
+}
+
+static pio_window_ops_t pio_window_iface = {
+        .get_pio_window = get_pio_window
+};
+
+/** 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,
+        .interfaces[PIO_WINDOW_DEV_IFACE] = &pio_window_iface
+};
 
 /** Initialize hc and rh DDF structures and their respective drivers.
@@ -109 +164 @@
 int device_setup_uhci(ddf_dev_t *device)
 {
-        assert(device);
-
-        hw_res_list_parsed_t hw_res;
-        int ret = hcd_ddf_get_registers(device, &hw_res);
-        if (ret != EOK ||
-            hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) {
-                usb_log_error("Failed to get register memory addresses "
-                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
-                    str_error(ret));
-                return ret;
-        }
-        addr_range_t regs = hw_res.io_ranges.ranges[0];
-        const int irq = hw_res.irqs.irqs[0];
-        hw_res_list_parsed_clean(&hw_res);
-
+        bool ih_registered = false;
+        bool hc_inited = false;
+        bool fun_bound = false;
+        int rc;
+
+        if (!device)
+                return EBADMEM;
+
+        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;
+
+        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);
 
-        ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        if (ret != EOK) {
-                usb_log_error("Failed to setup generic HCD.\n");
-                return ret;
-        }
-
-        hc_t *hc = malloc(sizeof(hc_t));
-        if (!hc) {
-                usb_log_error("Failed to allocate UHCI HC structure.\n");
-                ret = ENOMEM;
-                goto ddf_hc_clean;
-        }
+        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 = hcd_ddf_setup_interrupts(device, &regs, irq, irq_handler,
-            hc_gen_irq_code);
-        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");
@@ -152 +236 @@
         }
 
-        ret = disable_legacy(device);
-        if (ret != EOK) {
-                usb_log_error("Failed to disable legacy USB: %s.\n",
-                    str_error(ret));
-                goto irq_unregister;
-        }
-
-        ret = hc_init(hc, &regs, interrupts);
-        if (ret != EOK) {
-                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
-                goto irq_unregister;
-                // TODO This is unfortunate, we have neither legacy nor real USB
-        }
-
-        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) {
+        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, &regs, 0x10, 4);
+        if (rc != EOK) {
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",
-                    str_error(ret));
-                hc_fini(hc);
-irq_unregister:
+                    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);
-                free(hc);
-ddf_hc_clean:
-                hcd_ddf_clean_hc(device);
-        }
-        return ret;
+        if (instance->hc_fun != NULL)
+                ddf_fun_destroy(instance->hc_fun);
+        if (instance->rh_fun != NULL) {
+                ddf_fun_destroy(instance->rh_fun);
+        }
+        return rc;
 }
 /**