[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/8] usb/ehci: Abstract away PCI DMA API
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v3 4/8] usb/ehci: Abstract away PCI DMA API |
Date: |
Mon, 29 Oct 2012 11:34:35 +1000 |
Pull the DMAContext for the PCI DMA out at device init time and put it into
the device state. Use dma_memory_read/write() instead of pci specific versions.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/usb/hcd-ehci.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 2519484..f4c2884 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -390,6 +390,7 @@ struct EHCIState {
USBBus bus;
qemu_irq irq;
MemoryRegion mem;
+ DMAContext *dma;
MemoryRegion mem_caps;
MemoryRegion mem_opreg;
MemoryRegion mem_ports;
@@ -1302,7 +1303,7 @@ static inline int get_dwords(EHCIState *ehci, uint32_t
addr,
int i;
for(i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
- pci_dma_read(&ehci->dev, addr, buf, sizeof(*buf));
+ dma_memory_read(ehci->dma, addr, buf, sizeof(*buf));
*buf = le32_to_cpu(*buf);
}
@@ -1317,7 +1318,7 @@ static inline int put_dwords(EHCIState *ehci, uint32_t
addr,
for(i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
uint32_t tmp = cpu_to_le32(*buf);
- pci_dma_write(&ehci->dev, addr, &tmp, sizeof(tmp));
+ dma_memory_write(ehci->dma, addr, &tmp, sizeof(tmp));
}
return 1;
@@ -1400,7 +1401,7 @@ static int ehci_init_transfer(EHCIPacket *p)
cpage = get_field(p->qtd.token, QTD_TOKEN_CPAGE);
bytes = get_field(p->qtd.token, QTD_TOKEN_TBYTES);
offset = p->qtd.bufptr[0] & ~QTD_BUFPTR_MASK;
- pci_dma_sglist_init(&p->sgl, &p->queue->ehci->dev, 5);
+ qemu_sglist_init(&p->sgl, 5, p->queue->ehci->dma);
while (bytes > 0) {
if (cpage > 4) {
@@ -1629,7 +1630,7 @@ static int ehci_process_itd(EHCIState *ehci,
return USB_RET_PROCERR;
}
- pci_dma_sglist_init(&ehci->isgl, &ehci->dev, 2);
+ qemu_sglist_init(&ehci->isgl, 2, ehci->dma);
if (off + len > 4096) {
/* transfer crosses page border */
uint32_t len2 = off + len - 4096;
@@ -2389,7 +2390,7 @@ static void ehci_advance_periodic_state(EHCIState *ehci)
}
list |= ((ehci->frindex & 0x1ff8) >> 1);
- pci_dma_read(&ehci->dev, list, &entry, sizeof entry);
+ dma_memory_read(ehci->dma, list, &entry, sizeof entry);
entry = le32_to_cpu(entry);
DPRINTF("PERIODIC state adv fr=%d. [%08X] -> %08X\n",
@@ -2750,6 +2751,8 @@ static int usb_ehci_initfn(PCIDevice *dev)
s->irq = s->dev.irq[3];
+ s->dma = pci_dma_context(dev);
+
usb_bus_new(&s->bus, &ehci_bus_ops, &s->dev.qdev);
for(i = 0; i < NB_PORTS; i++) {
usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops,
--
1.7.0.4
- [Qemu-devel] [PATCH v3 0/8] Sysbus EHCI + Zynq USB., Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 1/8] dma: Define dma_context_memory and use in sysbus-ohci, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 2/8] usb/ehci: Use class_data to init PCI variations, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 3/8] usb/ehci: parameterise the register region offsets, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 4/8] usb/ehci: Abstract away PCI DMA API,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v3 5/8] usb/ehci: seperate out PCIisms, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 6/8] usb/ehci: Add Sysbus variant and Xilinx Zynq USB, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 7/8] xilinx_zynq: add USB controllers, Peter Crosthwaite, 2012/10/28
- [Qemu-devel] [PATCH v3 8/8] usb/ehci: Guard definition of EHCI_DEBUG, Peter Crosthwaite, 2012/10/28
- Re: [Qemu-devel] [PATCH v3 0/8] Sysbus EHCI + Zynq USB., Gerd Hoffmann, 2012/10/29