[RFC PATCH 13/13] usb-ohci: use the DMA memory access interface

Eduard - Gabriel Munteanu
2011-06-01T01:39:18Z

This allows the device to work properly with an emulated IOMMU.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
hw/usb-ohci.c | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index d21c820..9d1cf91 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -116,6 +116,11 @@ typedef struct {

} OHCIState;

+typedef struct {
+ PCIDevice pci_dev;
+ OHCIState state;
+} OHCIPCIState;
+
/* Host Controller Communications Area */
struct ohci_hcca {
uint32_t intr[32];
@@ -422,12 +427,13 @@ static void ohci_reset(void *opaque)
static inline int get_dwords(OHCIState *ohci,
uint32_t addr, uint32_t *buf, int num)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
int i;

addr += ohci->localmem_base;

for (i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
- cpu_physical_memory_read(addr, buf, sizeof(*buf));
+ pci_memory_read(&s->pci_dev, addr, buf, sizeof(*buf));
*buf = le32_to_cpu(*buf);
}

@@ -438,13 +444,14 @@ static inline int get_dwords(OHCIState *ohci,
static inline int put_dwords(OHCIState *ohci,
uint32_t addr, uint32_t *buf, int num)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
int i;

addr += ohci->localmem_base;

for (i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
uint32_t tmp = cpu_to_le32(*buf);
- cpu_physical_memory_write(addr, &tmp, sizeof(tmp));
+ pci_memory_write(&s->pci_dev, addr, &tmp, sizeof(tmp));
}

return 1;
@@ -454,12 +461,13 @@ static inline int put_dwords(OHCIState *ohci,
static inline int get_words(OHCIState *ohci,
uint32_t addr, uint16_t *buf, int num)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
int i;

addr += ohci->localmem_base;

for (i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
- cpu_physical_memory_read(addr, buf, sizeof(*buf));
+ pci_memory_read(&s->pci_dev, addr, buf, sizeof(*buf));
*buf = le16_to_cpu(*buf);
}

@@ -470,13 +478,14 @@ static inline int get_words(OHCIState *ohci,
static inline int put_words(OHCIState *ohci,
uint32_t addr, uint16_t *buf, int num)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
int i;

addr += ohci->localmem_base;

for (i = 0; i < num; i++, buf++, addr += sizeof(*buf)) {
uint16_t tmp = cpu_to_le16(*buf);
- cpu_physical_memory_write(addr, &tmp, sizeof(tmp));
+ pci_memory_write(&s->pci_dev, addr, &tmp, sizeof(tmp));
}

return 1;
@@ -504,7 +513,11 @@ static inline int ohci_read_iso_td(OHCIState *ohci,
static inline int ohci_read_hcca(OHCIState *ohci,
uint32_t addr, struct ohci_hcca *hcca)
{
- cpu_physical_memory_read(addr + ohci->localmem_base, hcca, sizeof(*hcca));
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
+
+ pci_memory_read(&s->pci_dev,
+ addr + ohci->localmem_base, hcca, sizeof(*hcca));
+
return 1;
}

@@ -530,7 +543,11 @@ static inline int ohci_put_iso_td(OHCIState *ohci,
static inline int ohci_put_hcca(OHCIState *ohci,
uint32_t addr, struct ohci_hcca *hcca)
{
- cpu_physical_memory_write(addr + ohci->localmem_base, hcca, sizeof(*hcca));
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
+
+ pci_memory_write(&s->pci_dev,
+ addr + ohci->localmem_base, hcca, sizeof(*hcca));
+
return 1;
}

@@ -538,6 +555,8 @@ static inline int ohci_put_hcca(OHCIState *ohci,
static void ohci_copy_td(OHCIState *ohci, struct ohci_td *td,
uint8_t *buf, int len, int write)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
+ DMADevice *dma = &s->pci_dev.dma;
uint32_t ptr;
uint32_t n;

@@ -545,12 +564,12 @@ static void ohci_copy_td(OHCIState *ohci, struct ohci_td *td,
n = 0x1000 - (ptr & 0xfff);
if (n > len)
n = len;
- cpu_physical_memory_rw(ptr + ohci->localmem_base, buf, n, write);
+ dma_memory_rw(dma, ptr + ohci->localmem_base, buf, n, write);
if (n == len)
return;
ptr = td->be & ~0xfffu;
buf += n;
- cpu_physical_memory_rw(ptr + ohci->localmem_base, buf, len - n, write);
+ dma_memory_rw(dma, ptr + ohci->localmem_base, buf, len - n, write);
}

/* Read/Write the contents of an ISO TD from/to main memory. */
@@ -558,6 +577,8 @@ static void ohci_copy_iso_td(OHCIState *ohci,
uint32_t start_addr, uint32_t end_addr,
uint8_t *buf, int len, int write)
{
+ OHCIPCIState *s = container_of(ohci, OHCIPCIState, state);
+ DMADevice *dma = &s->pci_dev.dma;
uint32_t ptr;
uint32_t n;

@@ -565,12 +586,12 @@ static void ohci_copy_iso_td(OHCIState *ohci,
n = 0x1000 - (ptr & 0xfff);
if (n > len)
n = len;
- cpu_physical_memory_rw(ptr + ohci->localmem_base, buf, n, write);
+ dma_memory_rw(dma, ptr + ohci->localmem_base, buf, n, write);
if (n == len)
return;
ptr = end_addr & ~0xfffu;
buf += n;
- cpu_physical_memory_rw(ptr + ohci->localmem_base, buf, len - n, write);
+ dma_memory_rw(dma, ptr + ohci->localmem_base, buf, len - n, write);
}

static void ohci_process_lists(OHCIState *ohci, int completion);
@@ -1706,11 +1727,6 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
qemu_register_reset(ohci_reset, ohci);
}

-typedef struct {
- PCIDevice pci_dev;
- OHCIState state;
-} OHCIPCIState;
-
static int usb_ohci_initfn_pci(struct PCIDevice *dev)
{
OHCIPCIState *ohci = DO_UPCAST(OHCIPCIState, pci_dev, dev);
--
1.7.3.4