arm/musicpal: use memdev for RAM
memory_region_allocate_system_memory() API is going away, so replace it with memdev allocated MemoryRegion. The later is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. PS: while at it add check for user supplied RAM size and error out if it mismatches board expected value. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-25-imammedo@redhat.com>
This commit is contained in:
parent
68637c3a36
commit
3ed61312bd
|
@ -32,6 +32,7 @@
|
||||||
#include "sysemu/runstate.h"
|
#include "sysemu/runstate.h"
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "ui/pixel_ops.h"
|
#include "ui/pixel_ops.h"
|
||||||
|
#include "qemu/cutils.h"
|
||||||
|
|
||||||
#define MP_MISC_BASE 0x80002000
|
#define MP_MISC_BASE 0x80002000
|
||||||
#define MP_MISC_SIZE 0x00001000
|
#define MP_MISC_SIZE 0x00001000
|
||||||
|
@ -1589,16 +1590,21 @@ static void musicpal_init(MachineState *machine)
|
||||||
int i;
|
int i;
|
||||||
unsigned long flash_size;
|
unsigned long flash_size;
|
||||||
DriveInfo *dinfo;
|
DriveInfo *dinfo;
|
||||||
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
MemoryRegion *address_space_mem = get_system_memory();
|
MemoryRegion *address_space_mem = get_system_memory();
|
||||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
||||||
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
||||||
|
|
||||||
|
/* For now we use a fixed - the original - RAM size */
|
||||||
|
if (machine->ram_size != mc->default_ram_size) {
|
||||||
|
char *sz = size_to_str(mc->default_ram_size);
|
||||||
|
error_report("Invalid RAM size, should be %s", sz);
|
||||||
|
g_free(sz);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
cpu = ARM_CPU(cpu_create(machine->cpu_type));
|
cpu = ARM_CPU(cpu_create(machine->cpu_type));
|
||||||
|
|
||||||
/* For now we use a fixed - the original - RAM size */
|
memory_region_add_subregion(address_space_mem, 0, machine->ram);
|
||||||
memory_region_allocate_system_memory(ram, NULL, "musicpal.ram",
|
|
||||||
MP_RAM_DEFAULT_SIZE);
|
|
||||||
memory_region_add_subregion(address_space_mem, 0, ram);
|
|
||||||
|
|
||||||
memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE,
|
memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE,
|
||||||
&error_fatal);
|
&error_fatal);
|
||||||
|
@ -1714,6 +1720,8 @@ static void musicpal_machine_init(MachineClass *mc)
|
||||||
mc->init = musicpal_init;
|
mc->init = musicpal_init;
|
||||||
mc->ignore_memory_transaction_failures = true;
|
mc->ignore_memory_transaction_failures = true;
|
||||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
||||||
|
mc->default_ram_size = MP_RAM_DEFAULT_SIZE;
|
||||||
|
mc->default_ram_id = "musicpal.ram";
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_MACHINE("musicpal", musicpal_machine_init)
|
DEFINE_MACHINE("musicpal", musicpal_machine_init)
|
||||||
|
|
Loading…
Reference in a new issue