Memory accesses must go through the IOMMU layer. Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@xxxxxxxxxxx> --- hw/ac97.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index 4319bc8..0e30d80 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -15,6 +15,7 @@ */ #include "hw.h" +#include "iommu.h" #include "audiodev.h" #include "audio/audio.h" #include "pci.h" @@ -221,9 +222,13 @@ static void cold_reset (AC97LinkState * s) static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r) { + struct iommu *iommu; + DeviceState *dev; uint8_t b[8]; - cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8); + iommu = iommu_get(&s->dev.qdev, &dev); + + iommu_read (iommu, dev, 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]); @@ -962,6 +967,9 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t temp = r->picb << 1; uint32_t written = 0; int to_copy = 0; + struct iommu *iommu; + DeviceState *dev; + temp = audio_MIN (temp, max); if (!temp) { @@ -969,10 +977,12 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r, return 0; } + iommu = iommu_get(&s->dev.qdev, &dev); + while (temp) { int copied; to_copy = audio_MIN (temp, sizeof (tmpbuf)); - cpu_physical_memory_read (addr, tmpbuf, to_copy); + iommu_read (iommu, dev, 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); @@ -1040,6 +1050,10 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t nread = 0; int to_copy = 0; SWVoiceIn *voice = (r - s->bm_regs) == MC_INDEX ? s->voice_mc : s->voice_pi; + struct iommu *iommu; + DeviceState *dev; + + iommu = iommu_get(&s->dev.qdev, &dev); temp = audio_MIN (temp, max); @@ -1056,7 +1070,7 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, *stop = 1; break; } - cpu_physical_memory_write (addr, tmpbuf, acquired); + iommu_write (iommu, dev, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; nread += acquired; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html