From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0Qu9-0006cT-Vd for qemu-devel@nongnu.org; Mon, 05 Sep 2011 00:35:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0Qu7-0002J8-33 for qemu-devel@nongnu.org; Mon, 05 Sep 2011 00:35:29 -0400 Received: from ozlabs.org ([203.10.76.45]:54125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0Qu6-0002IA-JV for qemu-devel@nongnu.org; Mon, 05 Sep 2011 00:35:26 -0400 From: David Gibson Date: Mon, 5 Sep 2011 14:34:59 +1000 Message-Id: <1315197304-22469-5-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1315197304-22469-1-git-send-email-david@gibson.dropbear.id.au> References: <1315197304-22469-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 4/9] ac97: Use PCI DMA stub functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, kraxel@redhat.com, mst@redhat.com, joerg.roedel@amd.com, agraf@suse.de, avi@redhat.com, eduard.munteanu@linux360.ro, rth@twiddle.net From: Eduard - Gabriel Munteanu This updates the ac97 device emulation to use the explicit PCI DMA functions, instead of directly calling physical memory access functions. Signed-off-by: Eduard - Gabriel Munteanu Signed-off-by: David Gibson --- hw/ac97.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/ac97.c b/hw/ac97.c index 541d9a4..14bdbcd 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -18,6 +18,7 @@ #include "audiodev.h" #include "audio/audio.h" #include "pci.h" +#include "dma.h" enum { AC97_Reset = 0x00, @@ -224,7 +225,7 @@ static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r) { uint8_t b[8]; - cpu_physical_memory_read (r->bdbar + r->civ * 8, b, 8); + pci_dma_read (&s->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]); @@ -973,7 +974,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); + pci_dma_read (&s->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); @@ -1054,7 +1055,7 @@ static int read_audio (AC97LinkState *s, AC97BusMasterRegs *r, *stop = 1; break; } - cpu_physical_memory_write (addr, tmpbuf, acquired); + pci_dma_write (&s->dev, addr, tmpbuf, acquired); temp -= acquired; addr += acquired; nread += acquired; -- 1.7.5.4