Patchwork [07/13] ac97: use the DMA memory access interface

login
register
mail settings
Submitter Eduard - Gabriel Munteanu
Date Jan. 29, 2011, 5:40 p.m.
Message ID <234682d40a0e4d57e03b9a6b0e336e90082e076d.1296321798.git.eduard.munteanu@linux360.ro>
Download mbox | patch
Permalink /patch/80946/
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/ac97.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/ac97.c b/hw/ac97.c
index d71072d..383c1b3 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -223,7 +223,7 @@  static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r)
 {
     uint8_t b[8];
 
-    cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8);
+    dma_memory_read (&s->dev.dma, r->bdbar + r->civ * 8, b, 8);
     r->bd_valid = 1;
     r->bd.addr = le32_to_cpu (*(uint32_t *) &b[0]) & ~3;
     r->bd.ctl_len = le32_to_cpu (*(uint32_t *) &b[4]);
@@ -972,7 +972,7 @@  static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r,
     while (temp) {
         int copied;
         to_copy = audio_MIN (temp, sizeof (tmpbuf));
-        cpu_physical_memory_read (addr, tmpbuf, to_copy);
+        dma_memory_read (&s->dev.dma, addr, tmpbuf, to_copy);
         copied = AUD_write (s->voice_po, tmpbuf, to_copy);
         dolog ("write_audio max=%x to_copy=%x copied=%x\n",
                max, to_copy, copied);
@@ -1056,7 +1056,7 @@  static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r,
             *stop = 1;
             break;
         }
-        cpu_physical_memory_write (addr, tmpbuf, acquired);
+        dma_memory_write (&s->dev.dma, addr, tmpbuf, acquired);
         temp -= acquired;
         addr += acquired;
         nread += acquired;