Changes in uspace/drv/ohci/hc.c [8790650:9ff5ff82] in mainline

File:

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

uspace/drv/ohci/hc.c

@@ -108 +108 @@
             ret, str_error(ret));
 
-        hc_gain_control(instance);
-        ret = hc_init_memory(instance);
-        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures:%s.\n",
-            ret, str_error(ret));
-        hc_init_hw(instance);
-
-        rh_init(&instance->rh, dev, instance->registers);
-
         if (!interrupts) {
                 instance->interrupt_emulator =
@@ -122 +114 @@
         }
 
+        hc_gain_control(instance);
+
+        rh_init(&instance->rh, dev, instance->registers);
+
+        hc_init_memory(instance);
+        hc_init_hw(instance);
+
+        /* TODO: implement */
         return EOK;
 }
@@ -140 +140 @@
         switch (batch->transfer_type) {
         case USB_TRANSFER_CONTROL:
-                instance->registers->control &= ~C_CLE;
                 instance->registers->command_status |= CS_CLF;
-                usb_log_debug2("Set control transfer filled: %x.\n",
-                        instance->registers->command_status);
-                instance->registers->control |= C_CLE;
                 break;
         case USB_TRANSFER_BULK:
                 instance->registers->command_status |= CS_BLF;
-                usb_log_debug2("Set bulk transfer filled: %x.\n",
-                        instance->registers->command_status);
                 break;
         default:
@@ -160 +154 @@
 {
         assert(instance);
-        if ((status & ~IS_SF) == 0) /* ignore sof status */
+        if (status == 0)
                 return;
         if (status & IS_RHSC)
@@ -166 +160 @@
 
         usb_log_info("OHCI interrupt: %x.\n", status);
-
 
         LIST_INITIALIZE(done);
@@ -199 +192 @@
 {
         assert(instance);
-        /* 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;
-
         /* Interrupt routing enabled => smm driver is active */
         if (instance->registers->control & C_IR) {
-                usb_log_debug("SMM driver: request ownership change.\n");
+                usb_log_info("Found SMM driver requesting ownership change.\n");
                 instance->registers->command_status |= CS_OCR;
                 while (instance->registers->control & C_IR) {
                         async_usleep(1000);
                 }
-                usb_log_info("SMM driver: Ownership taken.\n");
+                usb_log_info("Ownership taken from SMM driver.\n");
                 return;
         }
@@ -221 +207 @@
         /* Interrupt routing disabled && status != USB_RESET => BIOS active */
         if (hc_status != C_HCFS_RESET) {
-                usb_log_debug("BIOS driver found.\n");
+                usb_log_info("Found BIOS driver.\n");
                 if (hc_status == C_HCFS_OPERATIONAL) {
-                        usb_log_info("BIOS driver: HC operational.\n");
+                        usb_log_info("HC operational(BIOS).\n");
                         return;
                 }
@@ -229 +215 @@
                 instance->registers->control &= (C_HCFS_RESUME << C_HCFS_SHIFT);
                 async_usleep(20000);
-                usb_log_info("BIOS driver: HC resumed.\n");
                 return;
         }
@@ -235 +220 @@
         /* HC is in reset (hw startup) => no other driver
          * maintain reset for at least the time specified in USB spec (50 ms)*/
-        usb_log_info("HC found in reset.\n");
         async_usleep(50000);
+
+        /* turn off legacy emulation */
+        volatile uint32_t *ohci_emulation_reg =
+            (uint32_t*)((char*)instance->registers + 0x100);
+        usb_log_info("OHCI legacy register status %p: %x.\n",
+                ohci_emulation_reg, *ohci_emulation_reg);
+        *ohci_emulation_reg = 0;
+
 }
 /*----------------------------------------------------------------------------*/
 void hc_init_hw(hc_t *instance)
 {
-        /* OHCI guide page 42 */
-        assert(instance);
-        usb_log_debug2("Started hc initialization routine.\n");
-
-        /* Save contents of fm_interval register */
+        assert(instance);
         const uint32_t fm_interval = instance->registers->fm_interval;
-        usb_log_debug2("Old value of HcFmInterval: %x.\n", fm_interval);
-
-        /* Reset hc */
-        usb_log_debug2("HC reset.\n");
-        size_t time = 0;
+
+        /* reset hc */
         instance->registers->command_status = CS_HCR;
-        while (instance->registers->command_status & CS_HCR) {
-                async_usleep(10);
-                time += 10;
-        }
-        usb_log_debug2("HC reset complete in %zu us.\n", time);
-
-        /* Restore fm_interval */
+        async_usleep(10);
+
+        /* restore fm_interval */
         instance->registers->fm_interval = fm_interval;
         assert((instance->registers->command_status & CS_HCR) == 0);
 
         /* hc is now in suspend state */
-        usb_log_debug2("HC should be in suspend state(%x).\n",
-            instance->registers->control);
-
-        /* Enable queues */
+
+        /* enable queues */
         instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
-        usb_log_debug2("All queues enabled(%x).\n",
-            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;
-        usb_log_debug2("Enabled interrupts: %x.\n",
-            instance->registers->interrupt_enable);
-
-        /* Set periodic start to 90% */
-        uint32_t frame_length = ((fm_interval >> FMI_FI_SHIFT) & FMI_FI_MASK);
-        instance->registers->periodic_start = (frame_length / 10) * 9;
-        usb_log_debug2("All periodic start set to: %x(%u - 90%% of %d).\n",
-            instance->registers->periodic_start,
-            instance->registers->periodic_start, frame_length);
+        /* TODO: enable interrupts */
+        /* set periodic start to 90% */
+        instance->registers->periodic_start = (fm_interval / 10) * 9;
 
         instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);
-        usb_log_info("OHCI HC up and running(%x).\n",
-            instance->registers->control);
+        usb_log_info("OHCI HC up and running.\n");
 }
 /*----------------------------------------------------------------------------*/
@@ -334 +298 @@
 {
         assert(instance);
-        /* Init queues */
+        /* init queues */
         hc_init_transfer_lists(instance);
 
-        /*Init HCCA */
+        /* init HCCA */
         instance->hcca = malloc32(sizeof(hcca_t));
         if (instance->hcca == NULL)
@@ -343 +307 @@
         bzero(instance->hcca, sizeof(hcca_t));
         instance->registers->hcca = addr_to_phys(instance->hcca);
-        usb_log_debug2("OHCI HCCA initialized at %p(%p).\n",
-            instance->hcca, instance->registers->hcca);
-
-        /* Use queues */
+
+        /* use queues */
         instance->registers->bulk_head = instance->transfers_bulk.list_head_pa;
-        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
-            instance->transfers_bulk.list_head,
-            instance->transfers_bulk.list_head_pa);
-
         instance->registers->control_head =
             instance->transfers_control.list_head_pa;
-        usb_log_debug2("Control HEAD set to: %p(%p).\n",
-            instance->transfers_control.list_head,
-            instance->transfers_control.list_head_pa);
 
         unsigned i = 0;
@@ -363 +318 @@
                     instance->transfers_interrupt.list_head_pa;
         }
-        usb_log_debug2("Interrupt HEADs set to: %p(%p).\n",
-            instance->transfers_interrupt.list_head,
-            instance->transfers_interrupt.list_head_pa);
 
         return EOK;