[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 11/79] arm/collie: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v6 11/79] arm/collie: use memdev for RAM |
Date: |
Wed, 19 Feb 2020 11:08:45 -0500 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
v6:
* drop '.ram_size = 0x20000000' removal from collie_binfo
as arm_load_kernel() depends on it.
(Philippe Mathieu-Daudé <address@hidden>)
v2:
* fix format string causing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
v3:
* instead of RAM_ADDR_UFMT adding use size_to_str()
Philippe Mathieu-Daudé <address@hidden>
CC: address@hidden
CC: address@hidden
---
hw/arm/collie.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 970a4405cc..4992084a3f 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -10,6 +10,7 @@
*/
#include "qemu/osdep.h"
#include "qemu/units.h"
+#include "qemu/cutils.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "strongarm.h"
@@ -27,13 +28,18 @@ static void collie_init(MachineState *machine)
{
StrongARMState *s;
DriveInfo *dinfo;
- MemoryRegion *sdram = g_new(MemoryRegion, 1);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
+
+ 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);
+ }
s = sa1110_init(machine->cpu_type);
- memory_region_allocate_system_memory(sdram, NULL, "strongarm.sdram",
- collie_binfo.ram_size);
- memory_region_add_subregion(get_system_memory(), SA_SDCS0, sdram);
+ memory_region_add_subregion(get_system_memory(), SA_SDCS0, machine->ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,
@@ -57,6 +63,8 @@ static void collie_machine_init(MachineClass *mc)
mc->init = collie_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
+ mc->default_ram_size = 0x20000000;
+ mc->default_ram_id = "strongarm.sdram";
}
DEFINE_MACHINE("collie", collie_machine_init)
--
2.18.1
- [PATCH v6 31/79] arm/versatilepb: use memdev for RAM, (continued)
- [PATCH v6 31/79] arm/versatilepb: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 27/79] arm/palm: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 33/79] arm/virt: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 32/79] arm/vexpress: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 35/79] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 34/79] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 39/79] null-machine: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 30/79] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 36/79] arm/xlnx-versal-virt: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 38/79] s390x/s390-virtio-ccw: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 11/79] arm/collie: use memdev for RAM,
Igor Mammedov <=
- [PATCH v6 37/79] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 40/79] cris/axis_dev88: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 42/79] x86/microvm: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 43/79] x86/pc: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 46/79] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 45/79] lm32/milkymist: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 44/79] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 48/79] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 47/79] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 41/79] hppa: use memdev for RAM, Igor Mammedov, 2020/02/19