OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

arm/highbank: 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.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200219160953.13771-15-imammedo@redhat.com>
This commit is contained in:
Igor Mammedov 2020-02-19 11:08:48 -05:00 committed by Patchew Importer
parent 4daf95d607
commit 89c43bdf20
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/arm/highbank.c
View File

@ -236,7 +236,6 @@ enum cxmachines {
*/ */
static void calxeda_init(MachineState *machine, enum cxmachines machine_id) static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
{ {
ram_addr_t ram_size = machine->ram_size;
DeviceState *dev = NULL; DeviceState *dev = NULL;
SysBusDevice *busdev; SysBusDevice *busdev;
qemu_irq pic[128]; qemu_irq pic[128];
@ -247,7 +246,6 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
qemu_irq cpu_virq[4]; qemu_irq cpu_virq[4];
qemu_irq cpu_vfiq[4]; qemu_irq cpu_vfiq[4];
MemoryRegion *sysram; MemoryRegion *sysram;
MemoryRegion *dram;
MemoryRegion *sysmem; MemoryRegion *sysmem;
char *sysboot_filename; char *sysboot_filename;
@ -290,10 +288,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
} }
sysmem = get_system_memory(); sysmem = get_system_memory();
dram = g_new(MemoryRegion, 1);
memory_region_allocate_system_memory(dram, NULL, "highbank.dram", ram_size);
/* SDRAM at address zero. */ /* SDRAM at address zero. */
memory_region_add_subregion(sysmem, 0, dram); memory_region_add_subregion(sysmem, 0, machine->ram);
sysram = g_new(MemoryRegion, 1); sysram = g_new(MemoryRegion, 1);
memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000, memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000,
@ -387,7 +383,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
/* TODO create and connect IDE devices for ide_drive_get() */ /* TODO create and connect IDE devices for ide_drive_get() */
highbank_binfo.ram_size = ram_size; highbank_binfo.ram_size = machine->ram_size;
/* highbank requires a dtb in order to boot, and the dtb will override /* highbank requires a dtb in order to boot, and the dtb will override
* the board ID. The following value is ignored, so set it to -1 to be * the board ID. The following value is ignored, so set it to -1 to be
* clear that the value is meaningless. * clear that the value is meaningless.
@ -430,6 +426,7 @@ static void highbank_class_init(ObjectClass *oc, void *data)
mc->units_per_default_bus = 1; mc->units_per_default_bus = 1;
mc->max_cpus = 4; mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "highbank.dram";
} }
static const TypeInfo highbank_type = { static const TypeInfo highbank_type = {
@ -448,6 +445,7 @@ static void midway_class_init(ObjectClass *oc, void *data)
mc->units_per_default_bus = 1; mc->units_per_default_bus = 1;
mc->max_cpus = 4; mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "highbank.dram";
} }
static const TypeInfo midway_type = { static const TypeInfo midway_type = {