[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/12] intel-hda: Use PCI DMA stub functions
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 09/12] intel-hda: Use PCI DMA stub functions |
Date: |
Fri, 14 Oct 2011 20:21:00 +1100 |
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 <address@hidden>
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
hw/intel-hda.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 4272204..98790e8 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 */
@@ -328,7 +329,7 @@ static void intel_hda_corb_run(IntelHDAState *d)
rp = (d->corb_rp + 1) & 0xff;
addr = intel_hda_addr(d->corb_lbase, d->corb_ubase);
- verb = ldl_le_phys(addr + 4*rp);
+ verb = ldl_le_pci_dma(&d->pci, addr + 4*rp);
d->corb_rp = rp;
dprint(d, 2, "%s: [rp 0x%x] verb 0x%08x\n", __FUNCTION__, rp, verb);
@@ -360,8 +361,8 @@ static void intel_hda_response(HDACodecDevice *dev, bool
solicited, uint32_t res
ex = (solicited ? 0 : (1 << 4)) | dev->cad;
wp = (d->rirb_wp + 1) & 0xff;
addr = intel_hda_addr(d->rirb_lbase, d->rirb_ubase);
- stl_le_phys(addr + 8*wp, response);
- stl_le_phys(addr + 8*wp + 4, ex);
+ stl_le_pci_dma(&d->pci, addr + 8*wp, response);
+ stl_le_pci_dma(&d->pci, addr + 8*wp + 4, ex);
d->rirb_wp = wp;
dprint(d, 2, "%s: [wp 0x%x] response 0x%x, extra 0x%x\n",
@@ -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;
@@ -448,7 +448,7 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t
stnr, bool output,
}
if (d->dp_lbase & 0x01) {
addr = intel_hda_addr(d->dp_lbase & ~0x01, d->dp_ubase);
- stl_le_phys(addr + 8*s, st->lpib);
+ stl_le_pci_dma(&d->pci, addr + 8*s, st->lpib);
}
dprint(d, 3, "dma: --\n");
@@ -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.6.3
- [Qemu-devel] [PATCH 05/12] es1370: Use PCI DMA stub functions, (continued)
- [Qemu-devel] [PATCH 05/12] es1370: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 01/12] Add stub functions for PCI device models to do PCI DMA, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 07/12] lsi53c895a: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 03/12] eepro100: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 06/12] e1000: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 12/12] usb-uhci: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 02/12] rtl8139: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 10/12] PCI IDE: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 08/12] pcnet-pci: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 11/12] usb-ehci: Use PCI DMA stub functions, David Gibson, 2011/10/14
- [Qemu-devel] [PATCH 09/12] intel-hda: Use PCI DMA stub functions,
David Gibson <=
- Re: [Qemu-devel] [0/12] Preliminary work for IOMMU emulation support (v2), David Gibson, 2011/10/14
- Re: [Qemu-devel] [0/12] Preliminary work for IOMMU emulation support (v2), Alexander Graf, 2011/10/30