arm/mps2-tz: 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-23-imammedo@redhat.com>
This commit is contained in:
parent
4076cc9429
commit
70a2cb8e8d
|
@ -39,6 +39,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"
|
||||||
|
@ -79,7 +80,6 @@ typedef struct {
|
||||||
MachineState parent;
|
MachineState parent;
|
||||||
|
|
||||||
ARMSSE iotkit;
|
ARMSSE iotkit;
|
||||||
MemoryRegion psram;
|
|
||||||
MemoryRegion ssram[3];
|
MemoryRegion ssram[3];
|
||||||
MemoryRegion ssram1_m;
|
MemoryRegion ssram1_m;
|
||||||
MPS2SCC scc;
|
MPS2SCC scc;
|
||||||
|
@ -388,6 +388,13 @@ static void mps2tz_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);
|
||||||
|
}
|
||||||
|
|
||||||
sysbus_init_child_obj(OBJECT(machine), "iotkit", &mms->iotkit,
|
sysbus_init_child_obj(OBJECT(machine), "iotkit", &mms->iotkit,
|
||||||
sizeof(mms->iotkit), mmc->armsse_type);
|
sizeof(mms->iotkit), mmc->armsse_type);
|
||||||
iotkitdev = DEVICE(&mms->iotkit);
|
iotkitdev = DEVICE(&mms->iotkit);
|
||||||
|
@ -458,9 +465,7 @@ static void mps2tz_common_init(MachineState *machine)
|
||||||
* tradeoffs. For QEMU they're all just RAM, though. We arbitrarily
|
* tradeoffs. For QEMU they're all just RAM, though. We arbitrarily
|
||||||
* call the 16MB our "system memory", as it's the largest lump.
|
* call the 16MB our "system memory", as it's the largest lump.
|
||||||
*/
|
*/
|
||||||
memory_region_allocate_system_memory(&mms->psram,
|
memory_region_add_subregion(system_memory, 0x80000000, machine->ram);
|
||||||
NULL, "mps.ram", 16 * MiB);
|
|
||||||
memory_region_add_subregion(system_memory, 0x80000000, &mms->psram);
|
|
||||||
|
|
||||||
/* The overflow IRQs for all UARTs are ORed together.
|
/* The overflow IRQs for all UARTs are ORed together.
|
||||||
* Tx, Rx and "combined" IRQs are sent to the NVIC separately.
|
* Tx, Rx and "combined" IRQs are sent to the NVIC separately.
|
||||||
|
@ -642,6 +647,8 @@ static void mps2tz_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
||||||
mc->init = mps2tz_common_init;
|
mc->init = mps2tz_common_init;
|
||||||
iic->check = mps2_tz_idau_check;
|
iic->check = mps2_tz_idau_check;
|
||||||
|
mc->default_ram_size = 16 * MiB;
|
||||||
|
mc->default_ram_id = "mps.ram";
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
|
static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
Loading…
Reference in a new issue