integratorcp: convert to memory API (RAM/flash only)
Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
28e7796459
commit
b3cc496255
|
@ -13,11 +13,13 @@
|
|||
#include "boards.h"
|
||||
#include "arm-misc.h"
|
||||
#include "net.h"
|
||||
#include "exec-memory.h"
|
||||
|
||||
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 +110,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 +260,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,
|
||||
|
@ -456,7 +465,9 @@ static void integratorcp_init(ram_addr_t ram_size,
|
|||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
CPUState *env;
|
||||
ram_addr_t ram_offset;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||
MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
|
||||
qemu_irq pic[32];
|
||||
qemu_irq *cpu_pic;
|
||||
DeviceState *dev;
|
||||
|
@ -469,13 +480,14 @@ static void integratorcp_init(ram_addr_t ram_size,
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue