Changeset a81a1d09 in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-05-11T16:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/drv/ohci/hc.c (modified) (12 diffs)

uspace/drv/ohci/hc.c

@@ -40 +40 @@
 #include <usb/usb.h>
 #include <usb/ddfiface.h>
-#include <usb/usbdevice.h>
 
 #include "hc.h"
 #include "hcd_endpoint.h"
 
+#define OHCI_USED_INTERRUPTS \
+    (I_SO | I_WDH | I_UE | I_RHSC)
 static int interrupt_emulator(hc_t *instance);
 static void hc_gain_control(hc_t *instance);
-static void hc_init_hw(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
@@ -90 +90 @@
                 usb_log_error("Failed add root hub match-id.\n");
         }
+        ret = ddf_fun_bind(hub_fun);
         return ret;
 }
 /*----------------------------------------------------------------------------*/
-int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
-    uintptr_t regs, size_t reg_size, bool interrupts)
+int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts)
 {
         assert(instance);
@@ -109 +109 @@
             ret, str_error(ret));
 
+        list_initialize(&instance->pending_batches);
         usb_device_keeper_init(&instance->manager);
         ret = usb_endpoint_manager_init(&instance->ep_manager,
@@ -115 +116 @@
             str_error(ret));
 
-        hc_gain_control(instance);
         ret = hc_init_memory(instance);
         CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
             str_error(ret));
-        hc_init_hw(instance);
+#undef CHECK_RET_RETURN
+
+
+//      hc_init_hw(instance);
+        hc_gain_control(instance);
         fibril_mutex_initialize(&instance->guard);
 
@@ -130 +134 @@
         }
 
-        list_initialize(&instance->pending_batches);
-#undef CHECK_RET_RETURN
         return EOK;
 }
@@ -285 +287 @@
 {
         assert(instance);
-        if ((status & ~IS_SF) == 0) /* ignore sof status */
+        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
+        if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
-        if (status & IS_RHSC)
+        if (status & I_RHSC)
                 rh_interrupt(&instance->rh);
 
-        usb_log_debug("OHCI interrupt: %x.\n", status);
-
-        if (status & IS_WDH) {
+
+        if (status & I_WDH) {
                 fibril_mutex_lock(&instance->guard);
                 usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca,
@@ -332 +334 @@
 {
         assert(instance);
+        usb_log_debug("Requesting OHCI control.\n");
         /* Turn off legacy emulation */
         volatile uint32_t *ohci_emulation_reg =
             (uint32_t*)((char*)instance->registers + 0x100);
         usb_log_debug("OHCI legacy register %p: %x.\n",
-                ohci_emulation_reg, *ohci_emulation_reg);
-        *ohci_emulation_reg = 0;
+            ohci_emulation_reg, *ohci_emulation_reg);
+        /* Do not change A20 state */
+        *ohci_emulation_reg &= 0x100;
+        usb_log_debug("OHCI legacy register %p: %x.\n",
+            ohci_emulation_reg, *ohci_emulation_reg);
 
         /* Interrupt routing enabled => smm driver is active */
@@ -347 +353 @@
                 }
                 usb_log_info("SMM driver: Ownership taken.\n");
+                instance->registers->control &= (C_HCFS_RESET << C_HCFS_SHIFT);
+                async_usleep(50000);
                 return;
         }
@@ -372 +380 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_init_hw(hc_t *instance)
+void hc_start_hw(hc_t *instance)
 {
         /* OHCI guide page 42 */
@@ -421 +429 @@
             instance->registers->control);
 
-        /* Disable interrupts */
-        instance->registers->interrupt_disable = I_SF | I_OC;
-        usb_log_debug2("Disabling interrupts: %x.\n",
-            instance->registers->interrupt_disable);
-        instance->registers->interrupt_disable = I_MI;
+        /* Enable interrupts */
+        instance->registers->interrupt_enable = OHCI_USED_INTERRUPTS;
         usb_log_debug2("Enabled interrupts: %x.\n",
             instance->registers->interrupt_enable);
+        instance->registers->interrupt_enable = I_MI;
 
         /* Set periodic start to 90% */
@@ -473 +479 @@
 {
         assert(instance);
+
+        bzero(&instance->rh, sizeof(instance->rh));
         /* Init queues */
         hc_init_transfer_lists(instance);
@@ -492 +500 @@
             instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa);
 
+        /* Init interrupt code */
+        instance->interrupt_code.cmds = instance->interrupt_commands;
+        {
+                /* Read status register */
+                instance->interrupt_commands[0].cmd = CMD_MEM_READ_32;
+                instance->interrupt_commands[0].dstarg = 1;
+                instance->interrupt_commands[0].addr =
+                    (void*)&instance->registers->interrupt_status;
+
+                /* Test whether we are the interrupt cause */
+                instance->interrupt_commands[1].cmd = CMD_BTEST;
+                instance->interrupt_commands[1].value =
+                    OHCI_USED_INTERRUPTS;
+                instance->interrupt_commands[1].srcarg = 1;
+                instance->interrupt_commands[1].dstarg = 2;
+
+                /* Predicate cleaning and accepting */
+                instance->interrupt_commands[2].cmd = CMD_PREDICATE;
+                instance->interrupt_commands[2].value = 2;
+                instance->interrupt_commands[2].srcarg = 2;
+
+                /* Write clean status register */
+                instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;
+                instance->interrupt_commands[3].srcarg = 1;
+                instance->interrupt_commands[3].addr =
+                    (void*)&instance->registers->interrupt_status;
+
+                /* Accept interrupt */
+                instance->interrupt_commands[4].cmd = CMD_ACCEPT;
+
+                instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;
+        }
+
         return EOK;
 }