Changeset e7bc999 in mainline

Timestamp:

2011-03-20T21:36:17Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1fb1339, 33577f81, fd9f6e4c

Parents:

42dbb26

Message:

Add interrupt support

Fix register structure
Interrupts disabled as there is no way to access mm registers in the handler

Location:

uspace/drv/ohci

Files:

• main.c (modified) (3 diffs)
• ohci_hc.c (modified) (3 diffs)
• ohci_hc.h (modified) (1 diff)
• ohci_regs.h (modified) (2 diffs)
• ohci_rh.c (modified) (1 diff)
• pci.c (modified) (1 diff)

uspace/drv/ohci/main.c

@@ -48 +48 @@
 
 static int ohci_add_device(ddf_dev_t *device);
+/*----------------------------------------------------------------------------*/
+/** IRQ handling callback, identifies device
+ *
+ * @param[in] dev DDF instance of the device to use.
+ * @param[in] iid (Unused).
+ * @param[in] call Pointer to the call that represents interrupt.
+ */
+static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+{
+        assert(dev);
+        ohci_hc_t *hc = (ohci_hc_t*)dev->driver_data;
+        assert(hc);
+        ohci_hc_interrupt(hc, 0);
+}
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ohci_driver_ops = {
@@ -104 +118 @@
         }
 
-        ret = ohci_hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size);
+        bool interrupts = false;
+        ret = pci_enable_interrupts(device);
+        if (ret != EOK) {
+                usb_log_warning(
+                    "Failed(%d) to enable interrupts, fall back to polling.\n",
+                    ret);
+        } else {
+                usb_log_debug("Hw interrupts enabled.\n");
+                interrupts = true;
+        }
+
+        ret = ohci_hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver.\n");
@@ -110 +135 @@
                 return ret;
         }
+
+        ret = register_interrupt_handler(device, irq, irq_handler, NULL);
 
         hc_fun->ops = &hc_ops;

uspace/drv/ohci/ohci_hc.c

@@ -45 +45 @@
 
 int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
-    uintptr_t regs, size_t reg_size)
+    uintptr_t regs, size_t reg_size, bool interrupts)
 {
         assert(instance);
@@ -53 +53 @@
                 return ret;
         }
+        instance->registers->interrupt_disable = 0;
+        /* enable interrupt on root hub status change */
+        instance->registers->interupt_enable |= IE_RHSC | IE_MIE;
+
 
         ohci_rh_init(&instance->rh, instance->registers);
@@ -75 +79 @@
 {
         assert(instance);
+        /* TODO: Check for interrupt cause */
         ohci_rh_interrupt(&instance->rh);
         /* TODO: implement */

uspace/drv/ohci/ohci_hc.h

@@ -56 +56 @@
 
 int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
-     uintptr_t regs, size_t reg_size);
+     uintptr_t regs, size_t reg_size, bool interrupts);
 
 int ohci_hc_schedule(ohci_hc_t *instance, batch_t *batch);

uspace/drv/ohci/ohci_regs.h

@@ -42 +42 @@
         volatile uint32_t control;
         volatile uint32_t command_status;
+        volatile uint32_t interrupt_status;
         volatile uint32_t interupt_enable;
+#define IE_SO   (1 << 0)
+#define IE_WDH  (1 << 1)
+#define IE_SF   (1 << 2)
+#define IE_RD   (1 << 3)
+#define IE_UE   (1 << 4)
+#define IE_FNO  (1 << 5)
+#define IE_RHSC (1 << 6)
+#define IE_OC   (1 << 30)
+#define IE_MIE  (1 << 31)
+
         volatile uint32_t interrupt_disable;
         volatile uint32_t hcca;
@@ -60 +71 @@
         volatile uint32_t rh_status;
         volatile uint32_t rh_port_status[];
-} ohci_regs_t;
+} __attribute__((packed)) ohci_regs_t;
 #endif
 /**

uspace/drv/ohci/ohci_rh.c

@@ -62 +62 @@
 void ohci_rh_interrupt(ohci_rh_t *instance)
 {
+        usb_log_info("Interrupt!!.\n");
         /* TODO: implement */
 }

uspace/drv/ohci/pci.c

@@ -146 +146 @@
 int pci_enable_interrupts(ddf_dev_t *device)
 {
+        return ENOTSUP;
         int parent_phone =
             devman_parent_device_connect(device->handle, IPC_FLAG_BLOCKING);