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

File:

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

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

@@ -38 +38 @@
 
 #include <errno.h>
-#include <stdbool.h>
 #include <str_error.h>
 #include <ddf/interrupt.h>
@@ -132 +131 @@
 };
 
-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
+        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
 };
 
@@ -164 +149 @@
 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;
@@ -178 +158 @@
         }
 
+#define CHECK_RET_DEST_FREE_RETURN(ret, message...) \
+if (ret != EOK) { \
+        if (instance->hc_fun) \
+                ddf_fun_destroy(instance->hc_fun); \
+        if (instance->rh_fun) {\
+                ddf_fun_destroy(instance->rh_fun); \
+        } \
+        usb_log_error(message); \
+        return ret; \
+} else (void)0
+
+        instance->rh_fun = NULL;
         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;
-        }
-
+        int ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
+        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n");
         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;
-        }
-
+        ret = (instance->rh_fun == NULL) ? ENOMEM : EOK;
+        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI RH function.\n");
         ddf_fun_set_ops(instance->rh_fun, &rh_ops);
         ddf_fun_data_implant(instance->rh_fun, &instance->rh);
 
-        addr_range_t regs;
+        uintptr_t reg_base = 0;
+        size_t reg_size = 0;
         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);
-
-        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;
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to get I/O addresses 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);
+
+        ret = disable_legacy(device);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to disable legacy USB: %s.\n", str_error(ret));
+
+        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_DEST_FREE_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_DEST_FREE_RETURN(ret,
+            "Failed to register interrupt handler: %s.\n", str_error(ret));
 
         bool interrupts = false;
-        rc = enable_interrupts(device);
-        if (rc != EOK) {
+        ret = enable_interrupts(device);
+        if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(rc));
+                    " Falling back to polling.\n", str_error(ret));
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
@@ -236 +228 @@
         }
 
-        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(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;
-        }
+        ret = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to init uhci_hcd: %s.\n", str_error(ret));
+
+#define CHECK_RET_FINI_RETURN(ret, message...) \
+if (ret != EOK) { \
+        hc_fini(&instance->hc); \
+        CHECK_RET_DEST_FREE_RETURN(ret, message); \
+        return ret; \
+} else (void)0
+
+        ret = ddf_fun_bind(instance->hc_fun);
+        CHECK_RET_FINI_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
+            str_error(ret));
+
+        ret = ddf_fun_add_to_category(instance->hc_fun, USB_HC_CATEGORY);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to add UHCI to HC class: %s.\n", str_error(ret));
+
+        ret = rh_init(&instance->rh, instance->rh_fun,
+            (uintptr_t)instance->hc.registers + 0x10, 4);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to setup UHCI root hub: %s.\n", str_error(ret));
+
+        ret = ddf_fun_bind(instance->rh_fun);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to register UHCI root hub: %s.\n", str_error(ret));
 
         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;
+#undef CHECK_RET_FINI_RETURN
 }
 /**