Changeset 112d159 in mainline

Timestamp:

2011-04-09T13:14:51Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff0e354

Parents:

39db23f

Message:

Debug output and startup fixes

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (5 diffs)
• ohci_regs.h (modified) (3 diffs)
• root_hub.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -154 +154 @@
 {
         assert(instance);
-        if (status == 0)
+        if ((status & ~IS_SF) == 0) /* ignore sof status */
                 return;
         if (status & IS_RHSC)
@@ -192 +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_info("Found SMM driver requesting ownership change.\n");
+                usb_log_debug("SMM driver: request ownership change.\n");
                 instance->registers->command_status |= CS_OCR;
                 while (instance->registers->control & C_IR) {
                         async_usleep(1000);
                 }
-                usb_log_info("Ownership taken from SMM driver.\n");
+                usb_log_info("SMM driver: Ownership taken.\n");
                 return;
         }
@@ -207 +214 @@
         /* Interrupt routing disabled && status != USB_RESET => BIOS active */
         if (hc_status != C_HCFS_RESET) {
-                usb_log_info("Found BIOS driver.\n");
+                usb_log_debug("BIOS driver found.\n");
                 if (hc_status == C_HCFS_OPERATIONAL) {
-                        usb_log_info("HC operational(BIOS).\n");
+                        usb_log_info("BIOS driver: HC operational.\n");
                         return;
                 }
@@ -215 +222 @@
                 instance->registers->control &= (C_HCFS_RESUME << C_HCFS_SHIFT);
                 async_usleep(20000);
+                usb_log_info("BIOS driver: HC resumed.\n");
                 return;
         }
@@ -220 +228 @@
         /* 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)
 {
-        assert(instance);
+        /* OHCI guide page 42 */
+        assert(instance);
+        usb_log_debug2("Started hc initialization routine.\n");
+
+        /* Save contents of fm_interval register */
         const uint32_t fm_interval = instance->registers->fm_interval;
-
-        /* reset hc */
+        usb_log_debug2("Old value of HcFmInterval: %x.\n", fm_interval);
+
+        /* Reset hc */
+        usb_log_debug2("HC reset.\n");
+        size_t time = 0;
         instance->registers->command_status = CS_HCR;
-        async_usleep(10);
-
-        /* restore fm_interval */
+        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 */
         instance->registers->fm_interval = fm_interval;
         assert((instance->registers->command_status & CS_HCR) == 0);
 
         /* hc is now in suspend state */
-
-        /* enable queues */
+        usb_log_debug2("HC should be in suspend state(%x).\n",
+            instance->registers->control);
+
+        /* Enable queues */
         instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
-        /* TODO: enable interrupts */
-        /* set periodic start to 90% */
-        instance->registers->periodic_start = (fm_interval / 10) * 9;
+        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);
 
         instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);
-        usb_log_info("OHCI HC up and running.\n");
+        usb_log_info("OHCI HC up and running(%x).\n",
+            instance->registers->control);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/ohci_regs.h

@@ -84 +84 @@
         /** Interupt enable/disable, reads give the same value, writing causes
          * enable/disable */
-        volatile uint32_t interupt_enable;
+        volatile uint32_t interrupt_enable;
         volatile uint32_t interrupt_disable;
 #define I_SO   (1 << 0)   /* Scheduling overrun */
@@ -120 +120 @@
         /** Frame time and max packet size for all transfers */
         volatile uint32_t fm_interval;
-#define FMI_FI_MASK (0x1fff) /* Frame interval in bit times (should be 11999)*/
+#define FMI_FI_MASK (0x3fff) /* Frame interval in bit times (should be 11999)*/
 #define FMI_FI_SHIFT (0)
 #define FMI_FSMPS_MASK (0x7fff) /* Full speed max packet size */
@@ -138 +138 @@
         /** Remaining bit time in frame to start periodic transfers */
         volatile uint32_t periodic_start;
-#define PS_PS_MASK (0x1fff) /* bit time when periodic get priority (0x3e67) */
+#define PS_PS_MASK (0x3fff) /* bit time when periodic get priority (0x3e67) */
 
         /** Threshold for starting LS transaction */

uspace/drv/ohci/root_hub.c

@@ -209 +209 @@
         instance->registers = regs;
         instance->device = dev;
-        instance->port_count = instance->registers->rh_desc_a & 0xff;
+        instance->port_count =
+            (instance->registers->rh_desc_a >> RHDA_NDS_SHIFT) & RHDA_NDS_MASK;
         rh_init_descriptors(instance);
         // set port power mode to no-power-switching