From: David Gibson <david@gibson.dropbear.id.au>
To: qemu-devel@nongnu.org
Cc: joerg.roedel@amd.com, aliguori@us.ibm.com, rth@twiddle.net,
agraf@suse.de, eduard.munteanu@linux360.ro
Subject: [Qemu-devel] [PATCH 10/10] intel-hda: Use PCI DMA stub functions
Date: Thu, 1 Sep 2011 15:01:03 +1000 [thread overview]
Message-ID: <1314853263-2086-11-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1314853263-2086-1-git-send-email-david@gibson.dropbear.id.au>
This updates the intel-hda device emulation to use the explicit PCI DMA
functions, instead of directly calling physical memory access functions.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/intel-hda.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 4272204..392bfc5 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -24,6 +24,7 @@
#include "audiodev.h"
#include "intel-hda.h"
#include "intel-hda-defs.h"
+#include "dma.h"
/* --------------------------------------------------------------------- */
/* hda bus */
@@ -425,8 +426,7 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output,
dprint(d, 3, "dma: entry %d, pos %d/%d, copy %d\n",
st->be, st->bp, st->bpl[st->be].len, copy);
- cpu_physical_memory_rw(st->bpl[st->be].addr + st->bp,
- buf, copy, !output);
+ pci_dma_rw(&d->pci, st->bpl[st->be].addr + st->bp, buf, copy, !output);
st->lpib += copy;
st->bp += copy;
buf += copy;
@@ -470,7 +470,7 @@ static void intel_hda_parse_bdl(IntelHDAState *d, IntelHDAStream *st)
g_free(st->bpl);
st->bpl = g_malloc(sizeof(bpl) * st->bentries);
for (i = 0; i < st->bentries; i++, addr += 16) {
- cpu_physical_memory_read(addr, buf, 16);
+ pci_dma_read(&d->pci, addr, buf, 16);
st->bpl[i].addr = le64_to_cpu(*(uint64_t *)buf);
st->bpl[i].len = le32_to_cpu(*(uint32_t *)(buf + 8));
st->bpl[i].flags = le32_to_cpu(*(uint32_t *)(buf + 12));
--
1.7.5.4
next prev parent reply other threads:[~2011-09-01 5:01 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 5:00 [Qemu-devel] [0/10] Preliminary work for IOMMU emulation support; the easy bits David Gibson
2011-09-01 5:00 ` [Qemu-devel] [PATCH 01/10] Add stub functions for PCI device models to do PCI DMA David Gibson
2011-09-01 15:35 ` Michael S. Tsirkin
2011-09-02 0:39 ` David Gibson
2011-09-02 4:38 ` David Gibson
2011-09-05 7:55 ` Michael S. Tsirkin
2011-09-01 15:55 ` Anthony Liguori
2011-09-01 16:03 ` Avi Kivity
2011-09-01 16:05 ` Anthony Liguori
2011-09-01 16:11 ` Avi Kivity
2011-09-01 16:32 ` Anthony Liguori
2011-09-02 8:35 ` Avi Kivity
2011-09-03 12:25 ` Blue Swirl
2011-09-02 0:38 ` David Gibson
2011-09-02 8:37 ` Avi Kivity
2011-09-03 3:04 ` Eduard - Gabriel Munteanu
2011-09-02 4:40 ` David Gibson
2011-09-03 1:16 ` Richard Henderson
2011-09-23 16:37 ` Anthony Liguori
2011-09-01 5:00 ` [Qemu-devel] [PATCH 02/10] rtl8139: Use PCI DMA stub functions David Gibson
2011-09-01 5:00 ` [Qemu-devel] [PATCH 03/10] eepro100: " David Gibson
2011-09-01 5:00 ` [Qemu-devel] [PATCH 04/10] ac97: " David Gibson
2011-09-01 5:00 ` [Qemu-devel] [PATCH 05/10] es1370: " David Gibson
2011-09-01 5:00 ` [Qemu-devel] [PATCH 06/10] e1000: " David Gibson
2011-09-01 5:01 ` [Qemu-devel] [PATCH 07/10] lsi53c895a: " David Gibson
2011-09-01 5:01 ` [Qemu-devel] [PATCH 08/10] pcnet-pci: " David Gibson
2011-09-01 5:01 ` [Qemu-devel] [PATCH 09/10] usb-ohci: " David Gibson
2011-09-01 10:10 ` Gerd Hoffmann
2011-09-02 1:47 ` David Gibson
2011-09-01 5:01 ` David Gibson [this message]
2011-09-01 10:16 ` [Qemu-devel] [PATCH 10/10] intel-hda: " Gerd Hoffmann
2011-09-02 1:42 ` David Gibson
2011-09-01 11:33 ` [Qemu-devel] [0/10] Preliminary work for IOMMU emulation support; the easy bits Eduard - Gabriel Munteanu
2011-09-02 0:36 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314853263-2086-11-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=aliguori@us.ibm.com \
--cc=eduard.munteanu@linux360.ro \
--cc=joerg.roedel@amd.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).