Changeset 26e7d6d in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a347a11

Parents:

3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/bus/usb/ohci/ohci.c (moved) (moved from uspace/drv/ohci/ohci.c ) (11 diffs)

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "iface.h"
 #include "pci.h"
 #include "hc.h"
-#include "root_hub.h"
 
 typedef struct ohci {
@@ -52 +50 @@
 
         hc_t hc;
-        rh_t rh;
 } ohci_t;
 
@@ -58 +55 @@
 {
         assert(dev);
-        assert(dev->driver_data);
         return dev->driver_data;
 }
-
 /** IRQ handling callback, identifies device
  *
@@ -70 +65 @@
 static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
 {
-        hc_t *hc = &dev_to_ohci(dev)->hc;
-        assert(hc);
+        assert(dev);
+
+        ohci_t *ohci = dev_to_ohci(dev);
+        if (!ohci) {
+                usb_log_warning("Interrupt on device that is not ready.\n");
+                return;
+        }
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hc, status);
+        hc_interrupt(&ohci->hc, status);
 }
 /*----------------------------------------------------------------------------*/
@@ -86 +86 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.manager;
-
-        usb_address_t addr = usb_device_keeper_find(manager, handle);
+        usb_device_manager_t *manager =
+            &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
+
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
         if (addr < 0) {
                 return addr;
@@ -126 +127 @@
 /** Standard USB HC options (HC interface) */
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
 /*----------------------------------------------------------------------------*/
@@ -147 +148 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
+        assert(device);
+
         ohci_t *instance = malloc(sizeof(ohci_t));
         if (instance == NULL) {
@@ -152 +155 @@
                 return ENOMEM;
         }
+        instance->rh_fun = NULL;
+        instance->hc_fun = NULL;
 
 #define CHECK_RET_DEST_FREE_RETURN(ret, message...) \
 if (ret != EOK) { \
         if (instance->hc_fun) { \
-                instance->hc_fun->ops = NULL; \
-                instance->hc_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         } \
         if (instance->rh_fun) { \
-                instance->rh_fun->ops = NULL; \
-                instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
@@ -170 +171 @@
 } else (void)0
 
-        instance->rh_fun = NULL;
         instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci_hc");
         int ret = instance->hc_fun ? EOK : ENOMEM;
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI HC function.\n");
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to create OHCI HC function: %s.\n", str_error(ret));
         instance->hc_fun->ops = &hc_ops;
         instance->hc_fun->driver_data = &instance->hc;
@@ -179 +180 @@
         instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh");
         ret = instance->rh_fun ? EOK : ENOMEM;
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI RH function.\n");
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to create OHCI RH function: %s.\n", str_error(ret));
         instance->rh_fun->ops = &rh_ops;
 
@@ -188 +190 @@
         ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
-            "Failed to get memory addresses for %" PRIun ": %s.\n",
+            "Failed to get register memory addresses for %" PRIun ": %s.\n",
             device->handle, str_error(ret));
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
             (void *) reg_base, reg_size, irq);
 
+        const size_t cmd_count = hc_irq_cmd_count();
+        irq_cmd_t irq_cmds[cmd_count];
+        irq_code_t irq_code = { .cmdcount = cmd_count, .cmds = irq_cmds };
+
+        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));
+
+
+        /* 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));
+
+        /* Try to enable interrupts */
         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.\n",
-                    str_error(ret));
-                usb_log_info("HW interrupts not available, "
-                    "falling back to polling.\n");
+                usb_log_warning("Failed to enable interrupts: %s."
+                    " Falling back to polling\n", str_error(ret));
+                /* We don't need that handler */
+                unregister_interrupt_handler(device, irq);
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");
                 interrupts = true;
         }
-#endif
 
         ret = hc_init(&instance->hc, reg_base, reg_size, interrupts);
-        CHECK_RET_DEST_FREE_RETURN(ret, "Failed(%d) to init ohci_hcd.\n", ret);
+        CHECK_RET_DEST_FREE_RETURN(ret,
+            "Failed to init ohci_hcd: %s.\n", str_error(ret));
+
+        device->driver_data = instance;
 
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \
         hc_fini(&instance->hc); \
+        unregister_interrupt_handler(device, irq); \
         CHECK_RET_DEST_FREE_RETURN(ret, message); \
 } 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.\n", ret);
 
         ret = ddf_fun_bind(instance->hc_fun);
         CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to bind OHCI device function: %s.\n",
-            ret, str_error(ret));
-
-        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+            "Failed to bind OHCI 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 OHCI to HC class: %s.\n", str_error(ret));
 
-        device->driver_data = instance;
-
-        hc_start_hw(&instance->hc);
-        hc_register_hub(&instance->hc, instance->rh_fun);
-        return EOK;
-
-#undef CHECK_RET_DEST_FUN_RETURN
+        ret = hc_register_hub(&instance->hc, instance->rh_fun);
+        CHECK_RET_FINI_RETURN(ret,
+            "Failed to register OHCI root hub: %s.\n", str_error(ret));
+        return ret;
+
 #undef CHECK_RET_FINI_RETURN
 }