Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-02-12T10:11:47Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

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

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

@@ -476 +476 @@
                 return ETIMEOUT;
 
-        XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP, hc->dcbaa_dma.phys);
+        uintptr_t dcbaa_phys = dma_buffer_phys_base(&hc->dcbaa_dma);
+        XHCI_REG_WR(hc->op_regs, XHCI_OP_DCBAAP, dcbaa_phys);
         XHCI_REG_WR(hc->op_regs, XHCI_OP_MAX_SLOTS_EN, hc->max_slots);
 
@@ -490 +491 @@
         XHCI_REG_WR(intr0, XHCI_INTR_ERSTSZ, hc->event_ring.segment_count);
         XHCI_REG_WR(intr0, XHCI_INTR_ERDP, hc->event_ring.dequeue_ptr);
-        XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA, hc->event_ring.erst.phys);
+
+        const uintptr_t erstba_phys = dma_buffer_phys_base(&hc->event_ring.erst);
+        XHCI_REG_WR(intr0, XHCI_INTR_ERSTBA, erstba_phys);
 
         if (hc->base.irq_cap > 0) {
@@ -799 +802 @@
         if (err == EOK) {
                 dev->slot_id = cmd.slot_id;
-                hc->dcbaa[dev->slot_id] = host2xhci(64, dev->dev_ctx.phys);
+                hc->dcbaa[dev->slot_id] =
+                    host2xhci(64, dma_buffer_phys_base(&dev->dev_ctx));
         }