Changeset a501aaba in mainline

Timestamp:

2017-10-26T22:21:30Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5bc8250

Parents:

928afc8d

Message:

xhci trb_ring: fix ring wrapping

The Toggle Cycle of the Link TRB must be set, not the Cycle flag.

Location:

uspace/drv/bus/usb/xhci

Files:

• hw_struct/trb.h (modified) (2 diffs)
• trb_ring.c (modified) (3 diffs)

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

@@ -105 +105 @@
 #define TRB_COMPLETION_CODE(trb)        XHCI_DWORD_EXTRACT((trb).status, 31, 24)
 
+#define TRB_LINK_SET_TC(trb, val) \
+        xhci_dword_set_bits(&(trb).control, val, 1, 1)
+#define TRB_SET_CYCLE(trb, val) \
+        xhci_dword_set_bits(&(trb).control, val, 0, 0)
+
 #define TRB_CTRL_SET_SETUP_WLENGTH(trb, val) \
         xhci_qword_set_bits(&(trb).parameter, val, 63, 48)
@@ -153 +158 @@
             || type == XHCI_TRB_TYPE_STATUS_STAGE
             || type == XHCI_TRB_TYPE_ISOCH);
-}
-
-static inline void xhci_trb_set_cycle(xhci_trb_t *trb, bool cycle)
-{
-        xhci_dword_set_bits(&trb->control, cycle, 0, 0);
 }
 

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

@@ -107 +107 @@
         xhci_trb_t *last = segment_end(segment) - 1;
         xhci_trb_link_fill(last, segment->phys);
-        xhci_trb_set_cycle(last, true);
+        TRB_LINK_SET_TC(*last, true);
 
         ring->enqueue_segment = segment;
@@ -219 +219 @@
         trb = first_trb;
         for (size_t i = 0; i < trbs; ++i, ++trb) {
-                xhci_trb_set_cycle(trb, ring->pcs);
+                TRB_SET_CYCLE(*trb, ring->pcs);
                 xhci_trb_copy(ring->enqueue_trb, trb);
 
@@ -226 +226 @@
 
                 if (TRB_TYPE(*ring->enqueue_trb) == XHCI_TRB_TYPE_LINK) {
-                        // XXX: Check, whether the order here is correct (ambiguous instructions in 4.11.5.1)
-                        xhci_trb_set_cycle(ring->enqueue_trb, ring->pcs);
+                        TRB_SET_CYCLE(*ring->enqueue_trb, ring->pcs);
 
                         if (TRB_LINK_TC(*ring->enqueue_trb)) {