[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 30/80] arm/vexpress: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 30/80] arm/vexpress: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:37:55 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
CC: address@hidden
CC: address@hidden
---
hw/arm/vexpress.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 4673a88..ed683ee 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -273,7 +273,6 @@ static void a9_daughterboard_init(const
VexpressMachineState *vms,
{
MachineState *machine = MACHINE(vms);
MemoryRegion *sysmem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *lowram = g_new(MemoryRegion, 1);
ram_addr_t low_ram_size;
@@ -283,8 +282,6 @@ static void a9_daughterboard_init(const
VexpressMachineState *vms,
exit(1);
}
- memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem",
- ram_size);
low_ram_size = ram_size;
if (low_ram_size > 0x4000000) {
low_ram_size = 0x4000000;
@@ -293,9 +290,10 @@ static void a9_daughterboard_init(const
VexpressMachineState *vms,
* address space should in theory be remappable to various
* things including ROM or RAM; we always map the RAM there.
*/
- memory_region_init_alias(lowram, NULL, "vexpress.lowmem", ram, 0,
low_ram_size);
+ memory_region_init_alias(lowram, NULL, "vexpress.lowmem", machine->ram,
+ 0, low_ram_size);
memory_region_add_subregion(sysmem, 0x0, lowram);
- memory_region_add_subregion(sysmem, 0x60000000, ram);
+ memory_region_add_subregion(sysmem, 0x60000000, machine->ram);
/* 0x1e000000 A9MPCore (SCU) private memory region */
init_cpus(machine, cpu_type, TYPE_A9MPCORE_PRIV, 0x1e000000, pic,
@@ -360,7 +358,6 @@ static void a15_daughterboard_init(const
VexpressMachineState *vms,
{
MachineState *machine = MACHINE(vms);
MemoryRegion *sysmem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *sram = g_new(MemoryRegion, 1);
{
@@ -375,10 +372,8 @@ static void a15_daughterboard_init(const
VexpressMachineState *vms,
}
}
- memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem",
- ram_size);
/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */
- memory_region_add_subregion(sysmem, 0x80000000, ram);
+ memory_region_add_subregion(sysmem, 0x80000000, machine->ram);
/* 0x2c000000 A15MPCore private memory region (GIC) */
init_cpus(machine, cpu_type, TYPE_A15MPCORE_PRIV,
@@ -795,6 +790,7 @@ static void vexpress_class_init(ObjectClass *oc, void *data)
mc->init = vexpress_common_init;
mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true;
+ mc->default_ram_id = "vexpress.highmem";
}
static void vexpress_a9_class_init(ObjectClass *oc, void *data)
--
2.7.4
- [PATCH REPOST v3 24/80] arm/omap_sx1: use memdev for RAM, (continued)
- [PATCH REPOST v3 24/80] arm/omap_sx1: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 23/80] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 25/80] arm/palm: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 27/80] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 26/80] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 29/80] arm/versatilepb: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 30/80] arm/vexpress: use memdev for RAM,
Igor Mammedov <=
- [PATCH REPOST v3 28/80] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 34/80] arm/xlnx-versal-virt: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 32/80] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 31/80] arm/virt: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 35/80] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 33/80] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 37/80] null-machine: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 40/80] hw/hppa/machine: Restrict the total memory size to 3GB, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 41/80] hw/hppa/machine: Map the PDC memory region with higher priority, Igor Mammedov, 2020/01/23