Ticket #350: OHCI_rh_port_replug.patch

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

@@ -518 +518 @@
         instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);
         usb_log_debug("OHCI HC up and running (ctl_reg=0x%x).\n",
             instance->registers->control);
+        rh_replug(&instance->rh);
 }
 /*----------------------------------------------------------------------------*/
 /** Initialize schedule queues

uspace/drv/bus/usb/ohci/ohci_regs.h

@@ -137 +137 @@
 
         /** The first root hub control register */
         volatile uint32_t rh_desc_a;
-#define RHDA_NDS_MASK (0xff) /* Number of downstream ports, max 15 */
-#define RHDA_NDS_SHIFT (0)
+#define RHDA_NDP_MASK  (0xff)    /* Number of downstream ports, max 15 */
+#define RHDA_NDP_SHIFT (0)
 #define RHDA_PSM_FLAG  (1 << 8)  /* Power switching mode: 0-global, 1-per port*/
 #define RHDA_NPS_FLAG  (1 << 9)  /* No power switch: 1-power on, 0-use PSM*/
 #define RHDA_DT_FLAG   (1 << 10) /* 1-Compound device, must be 0 */

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

@@ -218 +218 @@
         assert(instance);
         instance->registers = regs;
         instance->port_count =
-            (instance->registers->rh_desc_a >> RHDA_NDS_SHIFT) & RHDA_NDS_MASK;
+            (instance->registers->rh_desc_a >> RHDA_NDP_SHIFT) & RHDA_NDP_MASK;
         int opResult = rh_init_descriptors(instance);
         if (opResult != EOK) {
                 return opResult;
         }
-        // set port power mode to no-power-switching
+
+        /* Set port power mode to no-power-switching (always on) */
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
+
         instance->unfinished_interrupt_transfer = NULL;
         instance->interrupt_mask_size = (instance->port_count + 8) / 8;
         instance->interrupt_buffer = malloc(instance->interrupt_mask_size);
@@ -236 +238 @@
 
         return EOK;
 }
+
+void rh_replug(rh_t *instance)
+{
+        assert(instance);
+        /* Simulate unplug */
+
+        /* Enable power-switching */
+        instance->registers->rh_desc_a &= ~RHDA_NPS_FLAG;
+        /* Set power switch to global */
+        instance->registers->rh_desc_a &= ~RHDA_PSM_FLAG;
+        /* Shut down ports */
+        instance->registers->rh_status |= RHS_CLEAR_PORT_POWER;
+        async_usleep(10000);
+        instance->registers->rh_status |= RHS_SET_PORT_POWER;
+
+        /* Set port power mode to no-power-switching (always on) */
+        instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
+}
 /*----------------------------------------------------------------------------*/
 
 /**

uspace/drv/bus/usb/ohci/root_hub.h

@@ -73 +73 @@
 
 int rh_init(rh_t *instance, ohci_regs_t *regs);
 
+void rh_replug(rh_t *instance);
+
 int rh_request(rh_t *instance, usb_transfer_batch_t *request);
 
 void rh_interrupt(rh_t *instance);