[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/25] etrax-dma: Convert to MemoryRegion
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 04/25] etrax-dma: Convert to MemoryRegion |
Date: |
Sun, 2 Oct 2011 16:26:35 +0200 |
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 d3082ac..94bfb70 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.3
- [Qemu-devel] [PATCH 07/25] serial: Use enum device_endian in serial_mm_init parameter, (continued)
- [Qemu-devel] [PATCH 07/25] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 18/25] milkymist-hpdmc: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 12/25] pxa: Pass in address_space to pxa{255, 270}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 06/25] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 03/25] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 22/25] milkymist-tmu2: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 17/25] milkymist-ac97: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 14/25] sun4u: Pass address_space_mem to sun4uv_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 13/25] sm501: Pass address_space_mem to sm501_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 04/25] etrax-dma: Convert to MemoryRegion,
Avi Kivity <=
- [Qemu-devel] [PATCH 09/25] serial: Add MemoryRegion parameter to serial_mm_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 16/25] openpic: Memory API conversion for mpic, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 21/25] milkymist-sysctl: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 20/25] milkymist-pfpu: convert to memory API, Avi Kivity, 2011/10/02
- Re: [Qemu-devel] [PULL 00/25] Memory API conversion, batch 10, Avi Kivity, 2011/10/09