Changeset 4abb134 in mainline

Timestamp:

2017-12-21T13:49:38Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

503086d8

Parents:

6f3700d

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-21 13:47:22)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-21 13:49:38)

Message:

xhci: fix not setting RCS flag

Location:

uspace/drv/bus/usb/xhci

Files:

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

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

@@ -401 +401 @@
         XHCI_REG_WR(hc->op_regs, XHCI_OP_MAX_SLOTS_EN, hc->max_slots);
 
-        uint64_t crptr = xhci_trb_ring_get_dequeue_ptr(&hc->cr.trb_ring);
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_LO, LOWER32(crptr) >> 6);
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crptr));
+        uint64_t crcr = xhci_trb_ring_get_dequeue_ptr(&hc->cr.trb_ring);
+        if (hc->cr.trb_ring.pcs)
+                crcr |= XHCI_REG_MASK(XHCI_OP_RCS);
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_LO, LOWER32(crcr));
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_CRCR_HI, UPPER32(crcr));
 
         xhci_interrupter_regs_t *intr0 = &hc->rt_regs->ir[0];

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

@@ -409 +409 @@
 #define XHCI_OP_CA             crcr_lo, 32,  FLAG, 2
 #define XHCI_OP_CRR            crcr_lo, 32,  FLAG, 3
-#define XHCI_OP_CRCR_LO        crcr_lo, 32, RANGE, 31, 6
+/* This shall be RANGE, 6, 0, but the value containing CR pointer and RCS flag
+ * must be written at once. */
+#define XHCI_OP_CRCR_LO        crcr_lo, 32, FIELD
 #define XHCI_OP_CRCR_HI        crcr_hi, 32, FIELD
 #define XHCI_OP_DCBAAP_LO    dcbaap_lo, 32, FIELD