[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion |
Date: |
Mon, 12 Sep 2011 13:51:01 +0300 |
From: "Edgar E. Iglesias" <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/etraxfs_dma.c | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index e8ad9e6..03a623b 100644
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw.h"
+#include "exec-memory.h"
#include "qemu-common.h"
#include "sysemu.h"
@@ -185,7 +186,7 @@ struct fs_dma_channel
struct fs_dma_ctrl
{
- int map;
+ MemoryRegion mmio;
int nr_channels;
struct fs_dma_channel *channels;
@@ -562,13 +563,17 @@ static uint32_t dma_rinvalid (void *opaque,
target_phys_addr_t addr)
return 0;
}
-static uint32_t
-dma_readl (void *opaque, target_phys_addr_t addr)
+static uint64_t
+dma_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{
struct fs_dma_ctrl *ctrl = opaque;
int c;
uint32_t r = 0;
+ if (size != 4) {
+ dma_rinvalid(opaque, addr);
+ }
+
/* Make addr relative to this channel and bounded to nr regs. */
c = fs_channel(addr);
addr &= 0xff;
@@ -608,11 +613,17 @@ static uint32_t dma_rinvalid (void *opaque,
target_phys_addr_t addr)
}
static void
-dma_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
+dma_write(void *opaque, target_phys_addr_t addr,
+ uint64_t val64, unsigned int size)
{
struct fs_dma_ctrl *ctrl = opaque;
+ uint32_t value = val64;
int c;
+ if (size != 4) {
+ dma_winvalid(opaque, addr, value);
+ }
+
/* Make addr relative to this channel and bounded to nr regs. */
c = fs_channel(addr);
addr &= 0xff;
@@ -668,16 +679,14 @@ static uint32_t dma_rinvalid (void *opaque,
target_phys_addr_t addr)
}
}
-static CPUReadMemoryFunc * const dma_read[] = {
- &dma_rinvalid,
- &dma_rinvalid,
- &dma_readl,
-};
-
-static CPUWriteMemoryFunc * const dma_write[] = {
- &dma_winvalid,
- &dma_winvalid,
- &dma_writel,
+static const MemoryRegionOps dma_ops = {
+ .read = dma_read,
+ .write = dma_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 4
+ }
};
static int etraxfs_dmac_run(void *opaque)
@@ -750,7 +759,9 @@ static void DMA_run(void *opaque)
ctrl->nr_channels = nr_channels;
ctrl->channels = g_malloc0(sizeof ctrl->channels[0] * nr_channels);
- ctrl->map = cpu_register_io_memory(dma_read, dma_write, ctrl,
DEVICE_NATIVE_ENDIAN);
- cpu_register_physical_memory(base, nr_channels * 0x2000, ctrl->map);
+ memory_region_init_io(&ctrl->mmio, &dma_ops, ctrl, "etraxfs-dma",
+ nr_channels * 0x2000);
+ memory_region_add_subregion(get_system_memory(), base, &ctrl->mmio);
+
return ctrl;
}
--
1.7.6.1
- [Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryRegion, (continued)
- [Qemu-devel] [PULL 17/28] serial: Convert serial_isa_initfn to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 25/28] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 18/28] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 08/28] pci: add pci_address_space_io(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 22/28] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 10/28] isa: add isa_register_ioport(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 13/28] i8254: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [PULL 21/28] etrax-ser: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 01/28] mips_jazz: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 26/28] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after piix4 initialization, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 11/28] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 07/28] omap1: convert to memory API (part II), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 19/28] pci: simplify memory region registration, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 16/28] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 09/28] isa: Pass i/o address space to isa_bus_new, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 27/28] serial: Remove ioregister parameter from serial_mm_init, Avi Kivity, 2011/09/12