Changes in uspace/drv/bus/usb/ohci/hc.c [f5bfd98:7de1988c] in mainline

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (10 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -34 +34 @@
  */
 
-#include <assert.h>
-#include <async.h>
 #include <errno.h>
-#include <macros.h>
-#include <mem.h>
-#include <stdlib.h>
+#include <stdbool.h>
 #include <str_error.h>
-#include <sys/types.h>
+#include <adt/list.h>
+#include <libarch/ddi.h>
 
 #include <usb/debug.h>
 #include <usb/usb.h>
-
+#include <usb/ddfiface.h>
+
+#include "hc.h"
 #include "ohci_endpoint.h"
-#include "ohci_batch.h"
-#include "utils/malloc32.h"
-
-#include "hc.h"
 
 #define OHCI_USED_INTERRUPTS \
@@ -89 +84 @@
 };
 
+enum {
+        /** Number of PIO ranges used in IRQ code */
+        hc_irq_pio_range_count = 
+            sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t),
+
+        /** Number of commands used in IRQ code */
+        hc_irq_cmd_count =
+            sizeof(ohci_irq_commands) / sizeof(irq_cmd_t)
+};
+
 static void hc_gain_control(hc_t *instance);
 static void hc_start(hc_t *instance);
@@ -94 +99 @@
 static int hc_init_memory(hc_t *instance);
 static int interrupt_emulator(hc_t *instance);
+static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 
 /** Generate IRQ code.
@@ -104 +110 @@
  * @return Error code.
  */
-int hc_gen_irq_code(irq_code_t *code, addr_range_t *regs)
-{
-        assert(code);
-        if (RNGSZ(*regs) < sizeof(ohci_regs_t))
+int
+hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
+    size_t cmds_size, addr_range_t *regs)
+{
+        if ((ranges_size < sizeof(ohci_pio_ranges)) ||
+            (cmds_size < sizeof(ohci_irq_commands)) ||
+            (RNGSZ(*regs) < sizeof(ohci_regs_t)))
                 return EOVERFLOW;
 
-        code->ranges = malloc(sizeof(ohci_pio_ranges));
-        if (code->ranges == NULL)
-                return ENOMEM;
-
-        code->cmds = malloc(sizeof(ohci_irq_commands));
-        if (code->cmds == NULL) {
-                free(code->ranges);
-                return ENOMEM;
-        }
-
-        code->rangecount = ARRAY_SIZE(ohci_pio_ranges);
-        code->cmdcount = ARRAY_SIZE(ohci_irq_commands);
-
-        memcpy(code->ranges, ohci_pio_ranges, sizeof(ohci_pio_ranges));
-        code->ranges[0].base = RNGABS(*regs);
-
-        memcpy(code->cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
+        memcpy(ranges, ohci_pio_ranges, sizeof(ohci_pio_ranges));
+        ranges[0].base = RNGABS(*regs);
+
+        memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
         ohci_regs_t *registers = (ohci_regs_t *) RNGABSPTR(*regs);
-        code->cmds[0].addr = (void *) &registers->interrupt_status;
-        code->cmds[3].addr = (void *) &registers->interrupt_status;
-        OHCI_WR(code->cmds[1].value, OHCI_USED_INTERRUPTS);
-
-        return EOK;
+        cmds[0].addr = (void *) &registers->interrupt_status;
+        cmds[3].addr = (void *) &registers->interrupt_status;
+        OHCI_WR(cmds[1].value, OHCI_USED_INTERRUPTS);
+
+        return EOK;
+}
+
+/** Register interrupt handler.
+ *
+ * @param[in] device Host controller DDF device
+ * @param[in] regs Register range
+ * @param[in] irq Interrupt number
+ * @paran[in] handler Interrupt handler
+ *
+ * @return EOK on success or negative error code
+ */
+int hc_register_irq_handler(ddf_dev_t *device, addr_range_t *regs, int irq,
+    interrupt_handler_t handler)
+{
+        int rc;
+
+        irq_pio_range_t irq_ranges[hc_irq_pio_range_count];
+        irq_cmd_t irq_cmds[hc_irq_cmd_count];
+
+        irq_code_t irq_code = {
+                .rangecount = hc_irq_pio_range_count,
+                .ranges = irq_ranges,
+                .cmdcount = hc_irq_cmd_count,
+                .cmds = irq_cmds
+        };
+
+        rc = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
+            sizeof(irq_cmds), regs);
+        if (rc != EOK) {
+                usb_log_error("Failed to generate IRQ code: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        /* Register handler to avoid interrupt lockup */
+        rc = register_interrupt_handler(device, irq, handler, &irq_code);
+        if (rc != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        return EOK;
+}
+
+/** Announce OHCI root hub to the DDF
+ *
+ * @param[in] instance OHCI driver intance
+ * @param[in] hub_fun DDF fuction representing OHCI root hub
+ * @return Error code
+ */
+int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
+{
+        bool addr_reqd = false;
+        bool ep_added = false;
+        bool fun_bound = false;
+        int rc;
+
+        assert(instance);
+        assert(hub_fun);
+
+        /* Try to get address 1 for root hub. */
+        instance->rh.address = 1;
+        rc = usb_device_manager_request_address(
+            &instance->generic.dev_manager, &instance->rh.address, false,
+            USB_SPEED_FULL);
+        if (rc != EOK) {
+                usb_log_error("Failed to get OHCI root hub address: %s\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        addr_reqd = true;
+
+        rc = usb_endpoint_manager_add_ep(
+            &instance->generic.ep_manager, instance->rh.address, 0,
+            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
+            0, NULL, NULL);
+        if (rc != EOK) {
+                usb_log_error("Failed to register root hub control endpoint: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        ep_added = true;
+
+        rc = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
+        if (rc != EOK) {
+                usb_log_error("Failed to add root hub match-id: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        rc = ddf_fun_bind(hub_fun);
+        if (rc != EOK) {
+                usb_log_error("Failed to bind root hub function: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
+        fun_bound = true;
+
+        rc = usb_device_manager_bind_address(&instance->generic.dev_manager,
+            instance->rh.address, ddf_fun_get_handle(hub_fun));
+        if (rc != EOK) {
+                usb_log_warning("Failed to bind root hub address: %s.\n",
+                    str_error(rc));
+        }
+
+        return EOK;
+error:
+        if (fun_bound)
+                ddf_fun_unbind(hub_fun);
+        if (ep_added) {
+                usb_endpoint_manager_remove_ep(
+                    &instance->generic.ep_manager, instance->rh.address, 0,
+                    USB_DIRECTION_BOTH, NULL, NULL);
+        }
+        if (addr_reqd) {
+                usb_device_manager_release_address(
+                    &instance->generic.dev_manager, instance->rh.address);
+        }
+        return rc;
 }
 
@@ -146 +265 @@
         assert(instance);
 
-        int ret = pio_enable_range(regs, (void **) &instance->registers);
-        if (ret != EOK) {
+        int rc = pio_enable_range(regs, (void **) &instance->registers);
+        if (rc != EOK) {
                 usb_log_error("Failed to gain access to device registers: %s.\n",
-                    str_error(ret));
-                return ret;
+                    str_error(rc));
+                return rc;
         }
 
         list_initialize(&instance->pending_batches);
+
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+        instance->generic.private_data = instance;
+        instance->generic.schedule = hc_schedule;
+        instance->generic.ep_add_hook = ohci_endpoint_init;
+        instance->generic.ep_remove_hook = ohci_endpoint_fini;
+
+        rc = hc_init_memory(instance);
+        if (rc != EOK) {
+                usb_log_error("Failed to create OHCI memory structures: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
         fibril_mutex_initialize(&instance->guard);
-
-        ret = hc_init_memory(instance);
-        if (ret != EOK) {
-                usb_log_error("Failed to create OHCI memory structures: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
 
         hc_gain_control(instance);
@@ -171 +298 @@
         }
 
-        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
+        rh_init(&instance->rh, instance->registers);
         hc_start(instance);
 
@@ -254 +381 @@
 {
         assert(hcd);
-        hc_t *instance = hcd->driver.data;
+        hc_t *instance = hcd->private_data;
         assert(instance);
 
         /* Check for root hub communication */
-        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
+        if (batch->ep->address == instance->rh.address) {
                 usb_log_debug("OHCI root hub request.\n");
-                return ohci_rh_schedule(&instance->rh, batch);
+                rh_request(&instance->rh, batch);
+                return EOK;
         }
         ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch);
@@ -299 +427 @@
         usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
-                ohci_rh_interrupt(&instance->rh);
+                rh_interrupt(&instance->rh);
 
         if (status & I_WDH) {
@@ -384 +512 @@
                 OHCI_SET(instance->registers->command_status, CS_OCR);
                 /* Hope that SMM actually knows its stuff or we can hang here */
-                while (OHCI_RD(instance->registers->control) & C_IR) {
+                while (OHCI_RD(instance->registers->control & C_IR)) {
                         async_usleep(1000);
                 }
@@ -497 +625 @@
 do { \
         const char *name = usb_str_transfer_type(type); \
-        const int ret = endpoint_list_init(&instance->lists[type], name); \
+        int ret = endpoint_list_init(&instance->lists[type], name); \
         if (ret != EOK) { \
                 usb_log_error("Failed to setup %s endpoint list: %s.\n", \