Changeset 0e7380f in mainline

Timestamp:

2018-01-13T00:18:28Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

94e9c29

Parents:

fb154e13

Message:

xhci: wait for conditions to hold in a systematic way

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (5 diffs)
• hw_struct/common.h (modified) (2 diffs)

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

@@ -387 +387 @@
                 return EOK;
 
-        /* TODO: Test this with USB3-aware BIOS */
+        if (xhci_reg_wait(&hc->op_regs->usbsts, XHCI_REG_MASK(XHCI_OP_CNR), 0))
+                return ETIMEOUT;
+
         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);
+        XHCI_REG_SET(hc->legsup, XHCI_LEGSUP_SEM_OS, 1);
         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,
@@ -395 +397 @@
                         XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS));
                 if (XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_BIOS) == 0) {
-                        assert(XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1);
-                        return EOK;
+                        return XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1 ? EOK : EIO;
                 }
                 async_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
@@ -410 +411 @@
 static int hc_reset(xhci_hc_t *hc)
 {
+        if (xhci_reg_wait(&hc->op_regs->usbsts, XHCI_REG_MASK(XHCI_OP_CNR), 0))
+                return ETIMEOUT;
+
         /* Stop the HC: set R/S to 0 */
         XHCI_REG_CLR(hc->op_regs, XHCI_OP_RS, 1);
 
-        /* Wait 16 ms until the HC is halted */
-        async_usleep(16000);
-        assert(XHCI_REG_RD(hc->op_regs, XHCI_OP_HCH));
+        /* Wait until the HC is halted - it shall take at most 16 ms */
+        if (xhci_reg_wait(&hc->op_regs->usbsts, XHCI_REG_MASK(XHCI_OP_HCH), XHCI_REG_MASK(XHCI_OP_HCH)))
+                return ETIMEOUT;
 
         /* Reset */
@@ -421 +425 @@
 
         /* Wait until the reset is complete */
-        while (XHCI_REG_RD(hc->op_regs, XHCI_OP_HCRST))
-                async_usleep(1000);
+        if (xhci_reg_wait(&hc->op_regs->usbcmd, XHCI_REG_MASK(XHCI_OP_HCRST), 0))
+                return ETIMEOUT;
 
         return EOK;
@@ -437 +441 @@
                 return err;
 
-        // FIXME: Waiting forever.
-        while (XHCI_REG_RD(hc->op_regs, XHCI_OP_CNR))
-                async_usleep(1000);
+        if (xhci_reg_wait(&hc->op_regs->usbsts, XHCI_REG_MASK(XHCI_OP_CNR), 0))
+                return ETIMEOUT;
 
         uint64_t dcbaaptr = hc->dcbaa_dma.phys;

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

@@ -42 +42 @@
 #include <assert.h>
 #include <bitops.h>
+#include <byteorder.h>
 #include <ddi.h>
-#include <byteorder.h>
+#include <errno.h>
 
 #define host2xhci(size, val) host2uint##size##_t_le((val))
@@ -88 +89 @@
 }
 
+static inline int xhci_reg_wait(xhci_dword_t *reg, uint32_t mask, uint32_t expected)
+{
+        mask = host2xhci(32, mask);
+        expected = host2xhci(32, expected);
+
+        unsigned retries = 100;
+        uint32_t value = *reg & mask;
+
+        for (; retries > 0 && value != expected; --retries) {
+                async_usleep(10000);
+                value = *reg & mask;
+        }
+
+        return value == expected ? EOK : ETIMEOUT;
+}
+
 #endif