Changeset 77ded647 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-02-01T11:42:11Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3e6ff9a

Parents:

17d34a8

Message:

xhci: do not avoid 64-bit writes

File:

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

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

@@ -477 +477 @@
 
         uint64_t dcbaaptr = hc->dcbaa_dma.phys;
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP_LO, LOWER32(dcbaaptr));
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP_HI, UPPER32(dcbaaptr));
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP, dcbaaptr);
         XHCI_REG_WR(hc->op_regs, XHCI_OP_MAX_SLOTS_EN, hc->max_slots);
 
         uintptr_t crcr;
         xhci_trb_ring_reset_dequeue_state(&hc->cr.trb_ring, &crcr);
-        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_REG_WR(hc->op_regs, XHCI_OP_CRCR, crcr);
 
         XHCI_REG_SET(hc->op_regs, XHCI_OP_EWE, 1);
@@ -492 +490 @@
         xhci_interrupter_regs_t *intr0 = &hc->rt_regs->ir[0];
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTSZ, hc->event_ring.segment_count);
-        uint64_t erdp = hc->event_ring.dequeue_ptr;
-        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_LO, LOWER32(erdp));
-        XHCI_REG_WR(intr0, XHCI_INTR_ERDP_HI, UPPER32(erdp));
-        uint64_t erstptr = hc->event_ring.erst.phys;
-        XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_LO, LOWER32(erstptr));
-        XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA_HI, UPPER32(erstptr));
+        XHCI_REG_WR(intr0, XHCI_INTR_ERDP, hc->event_ring.dequeue_ptr);
+        XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA, hc->event_ring.erst.phys);
 
         if (hc->base.irq_cap > 0) {
@@ -670 +664 @@
                 }
 
-                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));
+                XHCI_REG_WR(intr, XHCI_INTR_ERDP, hc->event_ring.dequeue_ptr);
         }
 
@@ -679 +671 @@
         uint64_t erdp = hc->event_ring.dequeue_ptr;
         erdp |= XHCI_REG_MASK(XHCI_INTR_ERDP_EHB);
-        XHCI_REG_WR(intr, XHCI_INTR_ERDP_LO, LOWER32(erdp));
-        XHCI_REG_WR(intr, XHCI_INTR_ERDP_HI, UPPER32(erdp));
+        XHCI_REG_WR(intr, XHCI_INTR_ERDP, erdp);
 
         usb_log_debug2("Event ring run finished.");