[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/24] integratorcp: convert to memory API (RAM/flas
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 11/24] integratorcp: convert to memory API (RAM/flash only) |
Date: |
Wed, 24 Aug 2011 13:11:10 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/integratorcp.c | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 3d4b339..720cc02 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -7,6 +7,8 @@
* This code is licensed under the GPL
*/
+#include <glib.h>
+
#include "sysbus.h"
#include "primecell.h"
#include "devices.h"
@@ -17,7 +19,8 @@
typedef struct {
SysBusDevice busdev;
uint32_t memsz;
- uint32_t flash_offset;
+ MemoryRegion flash;
+ bool flash_mapped;
uint32_t cm_osc;
uint32_t cm_ctrl;
uint32_t cm_lock;
@@ -108,9 +111,15 @@ static uint32_t integratorcm_read(void *opaque,
target_phys_addr_t offset)
static void integratorcm_do_remap(integratorcm_state *s, int flash)
{
if (flash) {
- cpu_register_physical_memory(0, 0x100000, IO_MEM_RAM);
+ if (s->flash_mapped) {
+ sysbus_del_memory(&s->busdev, &s->flash);
+ s->flash_mapped = false;
+ }
} else {
- cpu_register_physical_memory(0, 0x100000, s->flash_offset |
IO_MEM_RAM);
+ if (!s->flash_mapped) {
+ sysbus_add_memory_overlap(&s->busdev, 0, &s->flash, 1);
+ s->flash_mapped = true;
+ }
}
//??? tlb_flush (cpu_single_env, 1);
}
@@ -252,7 +261,8 @@ static int integratorcm_init(SysBusDevice *dev)
}
memcpy(integrator_spd + 73, "QEMU-MEMORY", 11);
s->cm_init = 0x00000112;
- s->flash_offset = qemu_ram_alloc(NULL, "integrator.flash", 0x100000);
+ memory_region_init_ram(&s->flash, NULL, "integrator.flash", 0x100000);
+ s->flash_mapped = false;
iomemtype = cpu_register_io_memory(integratorcm_readfn,
integratorcm_writefn, s,
@@ -458,7 +468,8 @@ static void integratorcp_init(MemoryRegion
*address_space_mem,
const char *initrd_filename, const char *cpu_model)
{
CPUState *env;
- ram_addr_t ram_offset;
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
+ MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
qemu_irq pic[32];
qemu_irq *cpu_pic;
DeviceState *dev;
@@ -471,13 +482,14 @@ static void integratorcp_init(MemoryRegion
*address_space_mem,
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
- ram_offset = qemu_ram_alloc(NULL, "integrator.ram", ram_size);
+ memory_region_init_ram(ram, NULL, "integrator.ram", ram_size);
/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */
/* ??? RAM should repeat to fill physical memory space. */
/* SDRAM at address zero*/
- cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
+ memory_region_add_subregion(address_space_mem, 0, ram);
/* And again at address 0x80000000 */
- cpu_register_physical_memory(0x80000000, ram_size, ram_offset |
IO_MEM_RAM);
+ memory_region_init_alias(ram_alias, "ram.alias", ram, 0, ram_size);
+ memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
dev = qdev_create(NULL, "integrator_core");
qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);
--
1.7.5.3
- Re: [Qemu-devel] [PATCH 01/24] arm_sysctl: convert to memory API, (continued)
- [Qemu-devel] [PATCH 05/24] ReadWriteHandler: remove, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 14/24] piix_pci: wrap memory update in a transaction, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 09/24] axis_dev88: convert to memory API (RAM only), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 23/24] milkymist-softusb: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 02/24] stellaris_enet: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 19/24] lm32_boards: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 08/24] armv7m: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 17/24] dummy_m68k: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 10/24] sysbus: add sysbus_add_memory_overlap(), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 11/24] integratorcp: convert to memory API (RAM/flash only),
Avi Kivity <=
- [Qemu-devel] [PATCH 20/24] mainstone: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 18/24] g364fb: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 21/24] mcf5208: convert to memory API, Avi Kivity, 2011/08/24
[Qemu-devel] [PATCH 07/24] an5206: convert to memory API, Avi Kivity, 2011/08/24