Changeset c9d905f in mainline

Timestamp:

2017-09-30T13:16:18Z (7 years ago)

Author:

jenda@…>

Branches:

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

Children:

4d28d86

Parents:

e6b0dba

Message:

macros for handoff delay

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (2 diffs)
• hw_struct/regs.h (modified) (1 diff)

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

@@ -327 +327 @@
         usb_log_debug2("LEGSUP: bios: %x, os: %x", hc->legsup->sem_bios, hc->legsup->sem_os);
         XHCI_REG_WR(hc->legsup, XHCI_LEGSUP_SEM_OS, 1);
-        for (int i = 0; i<1001; i++) {
+        for (int i = 0; i<=(XHCI_LEGSUP_BIOS_TIMEOUT_US/XHCI_LEGSUP_POLLING_DELAY_1MS); i++) {
                 usb_log_debug2("LEGSUP: elapsed: %i ms, bios: %x, os: %x", i,
                         XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS),
@@ -335 +335 @@
                         return EOK;
                 }
-                async_usleep(1000);
+                async_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
         }
         usb_log_error("BIOS did not release XHCI legacy hold!\n");

uspace/drv/bus/usb/xhci/hw_struct/regs.h

@@ -581 +581 @@
 #define XHCI_LEGSUP_SEM_OS      sem_os, 8, FLAG, 0
 
+#define XHCI_LEGSUP_POLLING_DELAY_1MS   1000
+#define XHCI_LEGSUP_BIOS_TIMEOUT_US     1000000 /* 4.22.1 BIOS may take up to 1 second to release the device */
+
 #endif
 /**