Changes in uspace/drv/bus/usb/uhci/uhci.c [fc6e607:5203e256] in mainline

File:

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

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

@@ -64 +64 @@
 {
         assert(dev);
+        assert(dev->driver_data);
         return dev->driver_data;
 }
@@ -77 +78 @@
         assert(dev);
         uhci_t *uhci = dev_to_uhci(dev);
-        if (!uhci) {
-                usb_log_error("Interrupt on not yet initialized device.\n");
-                return;
-        }
+        hc_t *hc = &uhci->hc;
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(&uhci->hc, status);
+        assert(hc);
+        hc_interrupt(hc, status);
 }
 /*----------------------------------------------------------------------------*/
@@ -193 +192 @@
         } \
         free(instance); \
-        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
@@ -224 +222 @@
         ret = pci_disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to disable legacy USB: %s.\n", str_error(ret));
-
-        const size_t cmd_count = hc_irq_cmd_count();
-        irq_cmd_t irq_cmds[cmd_count];
-        ret =
-            hc_get_irq_commands(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 = { .cmdcount = cmd_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));
+            "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
 
         bool interrupts = false;
+#ifdef CONFIG_USBHC_NO_INTERRUPTS
+        usb_log_warning("Interrupts disabled in OS config, " \
+            "falling back to polling.\n");
+#else
         ret = pci_enable_interrupts(device);
         if (ret != EOK) {
-                usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(ret));
+                usb_log_warning("Failed to enable interrupts: %s.\n",
+                    str_error(ret));
+                usb_log_info("HW interrupts not available, " \
+                    "falling back to polling.\n");
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
                 interrupts = true;
         }
+#endif
+
 
         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));
-
-        device->driver_data = instance;
+            "Failed(%d) to init uhci_hcd: %s.\n", ret, str_error(ret));
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
@@ -263 +253 @@
 } else (void)0
 
+        /* It does no harm if we register this on polling */
+        ret = register_interrupt_handler(device, irq, irq_handler,
+            &instance->hc.interrupt_code);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed(%d) to register interrupt handler: %s.\n",
+            ret, str_error(ret));
+
         ret = ddf_fun_bind(instance->hc_fun);
-        CHECK_RET_FINI_RETURN(ret, "Failed to bind UHCI device function: %s.\n",
-            str_error(ret));
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed(%d) to bind UHCI device function: %s.\n",
+            ret, str_error(ret));
 
         ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
@@ -274 +272 @@
             (uintptr_t)instance->hc.registers + 0x10, 4);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed to setup UHCI root hub: %s.\n", str_error(ret));
+            "Failed(%d) to setup UHCI root hub: %s.\n", ret, 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));
-
+            "Failed(%d) to register UHCI root hub: %s.\n", ret, str_error(ret));
+
+        device->driver_data = instance;
         return EOK;
 #undef CHECK_RET_FINI_RETURN