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

File:

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

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

@@ -85 +85 @@
 static int hc_init_mem_structures(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
+static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 
 static int hc_interrupt_emulator(void *arg);
 static int hc_debug_checker(void *arg);
 
-
-/** Get number of PIO ranges used in IRQ code.
- * @return Number of ranges.
- */
-size_t hc_irq_pio_range_count(void)
-{
-        return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t);
-}
-
-/** Get number of commands used in IRQ code.
- * @return Number of commands.
- */
-size_t hc_irq_cmd_count(void)
-{
-        return sizeof(uhci_irq_commands) / sizeof(irq_cmd_t);
-}
+enum {
+        /** Number of PIO ranges used in IRQ code */
+        hc_irq_pio_range_count =
+            sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t),
+
+        /* Number of commands used in IRQ code */
+        hc_irq_cmd_count =
+            sizeof(uhci_irq_commands) / sizeof(irq_cmd_t)
+};
 
 /** Generate IRQ code.
@@ -111 +105 @@
  * @param[out] cmds Commands buffer.
  * @param[in] cmds_size Size of the commands buffer (bytes).
- * @param[in] regs Physical address of device's registers.
- * @param[in] reg_size Size of the register area (bytes).
+ * @param[in] regs Device's register range.
  *
  * @return Error code.
@@ -118 +111 @@
 int
 hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
-    size_t cmds_size, uintptr_t regs, size_t reg_size)
+    size_t cmds_size, addr_range_t *regs)
 {
         if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
             (cmds_size < sizeof(uhci_irq_commands)) ||
-            (reg_size < sizeof(uhci_regs_t)))
+            (RNGSZ(*regs) < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
         memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
-        ranges[0].base = regs;
+        ranges[0].base = RNGABS(*regs);
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-        uhci_regs_t *registers = (uhci_regs_t *) regs;
-        cmds[0].addr = (void*)&registers->usbsts;
-        cmds[3].addr = (void*)&registers->usbsts;
+        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
+        cmds[0].addr = &registers->usbsts;
+        cmds[3].addr = &registers->usbsts;
+
+        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];
+        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 commands: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        irq_code_t irq_code = {
+                .rangecount = hc_irq_pio_range_count,
+                .ranges = irq_ranges,
+                .cmdcount = hc_irq_cmd_count,
+                .cmds = irq_cmds
+        };
+
+        /* 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;
@@ -196 +230 @@
  *
  * @param[in] instance Memory place to initialize.
- * @param[in] regs Address of I/O control registers.
- * @param[in] reg_size Size of I/O control registers.
+ * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
  * @return Error code.
@@ -205 +238 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interrupts)
-{
-        assert(reg_size >= sizeof(uhci_regs_t));
+int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
+{
+        assert(regs->size >= sizeof(uhci_regs_t));
+        int rc;
 
         instance->hw_interrupts = interrupts;
@@ -214 +248 @@
         /* allow access to hc control registers */
         uhci_regs_t *io;
-        int ret = pio_enable(regs, reg_size, (void **)&io);
-        if (ret != EOK) {
+        rc = pio_enable_range(regs, (void **) &io);
+        if (rc != EOK) {
                 usb_log_error("Failed to gain access to registers at %p: %s.\n",
-                    io, str_error(ret));
-                return ret;
-        }
+                    io, str_error(rc));
+                return rc;
+        }
+
         instance->registers = io;
-
         usb_log_debug(
-            "Device registers at %p (%zuB) accessible.\n", io, reg_size);
-
-        ret = hc_init_mem_structures(instance);
-        if (ret != EOK) {
-                usb_log_error("Failed to init UHCI memory structures: %s.\n",
-                    str_error(ret));
-                // TODO: we should disable pio here
-                return ret;
-        }
+            "Device registers at %p (%zuB) accessible.\n", io, regs->size);
+
+        rc = hc_init_mem_structures(instance);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize UHCI memory structures: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        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 = NULL;
 
         hc_init_hw(instance);
@@ -240 +280 @@
         }
         (void)hc_debug_checker;
-
-        uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");
 
         return EOK;
@@ -405 +443 @@
         assert(instance);
         assert(batch);
-
-        if (batch->ep->address == uhci_rh_get_address(&instance->rh))
-                return uhci_rh_schedule(&instance->rh, batch);
-
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
         if (!uhci_batch) {