Changes in uspace/drv/uhci-hcd/uhci_hc.c [ff34e5a:fcc525d] in mainline

File:

• uspace/drv/uhci-hcd/uhci_hc.c (modified) (4 diffs)

uspace/drv/uhci-hcd/uhci_hc.c

@@ -97 +97 @@
 
         instance->hw_interrupts = interrupts;
+        instance->hw_failures = 0;
+
         /* Setup UHCI function. */
         instance->ddf_instance = fun;
@@ -149 +151 @@
         while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
-        /* Set framelist pointer */
+        /* Set frame to exactly 1ms */
+        pio_write_8(&registers->sofmod, 64);
+
+        /* Set frame list pointer */
         const uint32_t pa = addr_to_phys(instance->frame_list);
         pio_write_32(&registers->flbaseadd, pa);
@@ -347 +352 @@
 {
         assert(instance);
-        /* TODO: Check interrupt cause here */
+        /* TODO: Resume interrupts are not supported */
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & 0x3) {
@@ -354 +359 @@
                 transfer_list_remove_finished(&instance->transfers_control_full);
                 transfer_list_remove_finished(&instance->transfers_bulk_full);
+        }
+        /* bits 4 and 5 indicate hc error */
+        if (status & 0x18) {
+                usb_log_error("UHCI hardware failure!.\n");
+                ++instance->hw_failures;
+                transfer_list_abort_all(&instance->transfers_interrupt);
+                transfer_list_abort_all(&instance->transfers_control_slow);
+                transfer_list_abort_all(&instance->transfers_control_full);
+                transfer_list_abort_all(&instance->transfers_bulk_full);
+
+                if (instance->hw_failures < UHCI_ALLOWED_HW_FAIL) {
+                        /* reinitialize hw, this triggers virtual disconnect*/
+                        uhci_hc_init_hw(instance);
+                } else {
+                        usb_log_fatal("Too many UHCI hardware failures!.\n");
+                        uhci_hc_fini(instance);
+                }
         }
 }