Changeset 12fba858 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2017-07-19T18:29:32Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

9af3281

Parents:

955e988

Message:

Fixed the value of ERDP sent to the xHC, according to section 4.9.4 it is supposed to be the value of ERST[0].BaseAddress, which is stored in the dequeue_ptr field of the event ring.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (2 diffs)

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

@@ -320 +320 @@
 
         uint64_t erstptr = addr_to_phys(hc->event_ring.erst);
+        uint64_t erdp = hc->event_ring.dequeue_ptr;
         xhci_interrupter_regs_t *intr0 = &hc->rt_regs->ir[0];
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTSZ, hc->event_ring.segment_count);
-        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_LO, LOWER32(erstptr));
-        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_HI, UPPER32(erstptr));
+        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_LO, LOWER32(erdp));
+        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_HI, UPPER32(erdp));
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_LO, LOWER32(erstptr));
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_HI, UPPER32(erstptr));
@@ -397 +398 @@
 
         /* Update the ERDP to make room in the ring */
-        uint64_t erstptr = addr_to_phys(hc->event_ring.erst);
-        XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erstptr));
-        XHCI_REG_WR(intr, XHCI_INTR_ERDP_HI, UPPER32(erstptr));
+        uint64_t erdp = hc->event_ring.dequeue_ptr;
+        XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erdp));
+        XHCI_REG_WR(intr, XHCI_INTR_ERDP_HI, UPPER32(erdp));
 }