arm/mps2: 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200219160953.13771-24-imammedo@redhat.com>
This commit is contained in:
parent
70a2cb8e8d
commit
68637c3a36
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qemu/units.h"
|
#include "qemu/units.h"
|
||||||
|
#include "qemu/cutils.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "hw/arm/boot.h"
|
#include "hw/arm/boot.h"
|
||||||
|
@ -55,7 +56,6 @@ typedef struct {
|
||||||
MachineState parent;
|
MachineState parent;
|
||||||
|
|
||||||
ARMv7MState armv7m;
|
ARMv7MState armv7m;
|
||||||
MemoryRegion psram;
|
|
||||||
MemoryRegion ssram1;
|
MemoryRegion ssram1;
|
||||||
MemoryRegion ssram1_m;
|
MemoryRegion ssram1_m;
|
||||||
MemoryRegion ssram23;
|
MemoryRegion ssram23;
|
||||||
|
@ -118,6 +118,13 @@ static void mps2_common_init(MachineState *machine)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
/* The FPGA images have an odd combination of different RAMs,
|
/* The FPGA images have an odd combination of different RAMs,
|
||||||
* because in hardware they are different implementations and
|
* because in hardware they are different implementations and
|
||||||
* connected to different buses, giving varying performance/size
|
* connected to different buses, giving varying performance/size
|
||||||
|
@ -146,9 +153,7 @@ static void mps2_common_init(MachineState *machine)
|
||||||
* This is of no use for QEMU so we don't implement it (as if
|
* This is of no use for QEMU so we don't implement it (as if
|
||||||
* zbt_boot_ctrl is always zero).
|
* zbt_boot_ctrl is always zero).
|
||||||
*/
|
*/
|
||||||
memory_region_allocate_system_memory(&mms->psram,
|
memory_region_add_subregion(system_memory, 0x21000000, machine->ram);
|
||||||
NULL, "mps.ram", 16 * MiB);
|
|
||||||
memory_region_add_subregion(system_memory, 0x21000000, &mms->psram);
|
|
||||||
|
|
||||||
switch (mmc->fpga_type) {
|
switch (mmc->fpga_type) {
|
||||||
case FPGA_AN385:
|
case FPGA_AN385:
|
||||||
|
@ -338,6 +343,8 @@ static void mps2_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
||||||
mc->init = mps2_common_init;
|
mc->init = mps2_common_init;
|
||||||
mc->max_cpus = 1;
|
mc->max_cpus = 1;
|
||||||
|
mc->default_ram_size = 16 * MiB;
|
||||||
|
mc->default_ram_id = "mps.ram";
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mps2_an385_class_init(ObjectClass *oc, void *data)
|
static void mps2_an385_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
Loading…
Reference in a new issue