[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 31/80] arm/versatilepb: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 31/80] arm/versatilepb: use memdev for RAM |
Date: |
Fri, 31 Jan 2020 16:09:01 +0100 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/versatilepb.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index e86af01..f3c4a50 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -184,7 +184,6 @@ static void versatile_init(MachineState *machine, int
board_id)
Object *cpuobj;
ARMCPU *cpu;
MemoryRegion *sysmem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
qemu_irq pic[32];
qemu_irq sic[32];
DeviceState *dev, *sysctl;
@@ -220,11 +219,9 @@ static void versatile_init(MachineState *machine, int
board_id)
cpu = ARM_CPU(cpuobj);
- memory_region_allocate_system_memory(ram, NULL, "versatile.ram",
- machine->ram_size);
/* ??? RAM should repeat to fill physical memory space. */
/* SDRAM at address zero. */
- memory_region_add_subregion(sysmem, 0, ram);
+ memory_region_add_subregion(sysmem, 0, machine->ram);
sysctl = qdev_create(NULL, "realview_sysctl");
qdev_prop_set_uint32(sysctl, "sys_id", 0x41007004);
@@ -398,6 +395,7 @@ static void versatilepb_class_init(ObjectClass *oc, void
*data)
mc->block_default_type = IF_SCSI;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ mc->default_ram_id = "versatile.ram";
}
static const TypeInfo versatilepb_type = {
@@ -415,6 +413,7 @@ static void versatileab_class_init(ObjectClass *oc, void
*data)
mc->block_default_type = IF_SCSI;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ mc->default_ram_id = "versatile.ram";
}
static const TypeInfo versatileab_type = {
--
2.7.4
- [PATCH v4 25/80] arm/nseries: use memdev for RAM, (continued)
- [PATCH v4 25/80] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 26/80] arm/omap_sx1: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 27/80] arm/palm: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 21/80] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 24/80] arm/musicpal: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 28/80] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 29/80] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 22/80] arm/mps2-tz: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 32/80] arm/vexpress: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 30/80] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 31/80] arm/versatilepb: use memdev for RAM,
Igor Mammedov <=
- [PATCH v4 36/80] arm/xlnx-versal-virt: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 35/80] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 37/80] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 33/80] arm/virt: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 39/80] null-machine: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 34/80] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 38/80] s390x/s390-virtio-ccw: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 40/80] cris/axis_dev88: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 41/80] hppa: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 42/80] x86/microvm: use memdev for RAM, Igor Mammedov, 2020/01/31