Changeset fcc525d in mainline

Timestamp:

2011-03-17T13:49:20Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0fd82c9, 3036735

Parents:

87037c48

Message:

Limit the number of hw retries

Location:

uspace/drv/uhci-hcd

Files:

• uhci_hc.c (modified) (2 diffs)
• uhci_hc.h (modified) (2 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;
@@ -360 +362 @@
         /* 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);
-                /* reinitialize hw, this triggers virtual disconnect*/
-                uhci_hc_init_hw(instance);
+
+                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);
+                }
         }
 }

uspace/drv/uhci-hcd/uhci_hc.h

@@ -80 +80 @@
 #define UHCI_CLEANER_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 5000000
+#define UHCI_ALLOWED_HW_FAIL 5
 
 typedef struct uhci_hc {
@@ -100 +101 @@
         fid_t debug_checker;
         bool hw_interrupts;
+        unsigned hw_failures;
 
         ddf_fun_t *ddf_instance;