Patchwork [11/13] pcnet: use the DMA memory access interface

login
register
mail settings
Submitter Eduard - Gabriel Munteanu
Date Jan. 29, 2011, 5:40 p.m.
Message ID <800fc3514ae6d70eb429a10259b241f8eb790a3c.1296321798.git.eduard.munteanu@linux360.ro>
Download mbox | patch
Permalink /patch/80953/
State New
Headers show

Comments

Eduard - Gabriel Munteanu - Jan. 29, 2011, 5:40 p.m.
This allows the device to work properly with an emulated IOMMU.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
 hw/pcnet-pci.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index 339a401..3f55c42 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -230,13 +230,13 @@  static void pcnet_mmio_map(PCIDevice *pci_dev, int region_num,
 static void pci_physical_memory_write(void *dma_opaque, target_phys_addr_t addr,
                                       uint8_t *buf, int len, int do_bswap)
 {
-    cpu_physical_memory_write(addr, buf, len);
+    dma_memory_write(dma_opaque, addr, buf, len);
 }
 
 static void pci_physical_memory_read(void *dma_opaque, target_phys_addr_t addr,
                                      uint8_t *buf, int len, int do_bswap)
 {
-    cpu_physical_memory_read(addr, buf, len);
+    dma_memory_read(dma_opaque, addr, buf, len);
 }
 
 static void pci_pcnet_cleanup(VLANClientState *nc)
@@ -306,6 +306,7 @@  static int pci_pcnet_init(PCIDevice *pci_dev)
     s->irq = pci_dev->irq[0];
     s->phys_mem_read = pci_physical_memory_read;
     s->phys_mem_write = pci_physical_memory_write;
+    s->dma_opaque = &pci_dev->dma;
 
     if (!pci_dev->qdev.hotplugged) {
         static int loaded = 0;