[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 11/79] arm/collie: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 11/79] arm/collie: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:33:44 -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.
- introduce RAM_ADDR_UFMT to avoid build errors on 32-bit hosts
when specifying format string for ram_addr_t type
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Andrew Jones <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>
---
hw/arm/collie.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 970a4405cc..024893fc9e 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"
@@ -20,20 +21,24 @@
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
- .ram_size = 0x20000000,
};
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 +62,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
- Re: [PATCH v5 02/79] machine: introduce memory-backend property, (continued)
- [PATCH v5 03/79] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/02/17
- [PATCH v5 04/79] machine: introduce convenience MachineState::ram, Igor Mammedov, 2020/02/17
- [PATCH v5 05/79] initialize MachineState::ram in NUMA case, Igor Mammedov, 2020/02/17
- [PATCH v5 06/79] vl.c: move -m parsing after memory backends has been processed, Igor Mammedov, 2020/02/17
- [PATCH v5 08/79] alpha/dp264: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 07/79] vl.c: ensure that ram_size matches size of machine.memory-backend, Igor Mammedov, 2020/02/17
- [PATCH v5 11/79] arm/collie: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 10/79] arm/aspeed: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 12/79] arm/cubieboard: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 09/79] arm/aspeed: actually check RAM size, Igor Mammedov, 2020/02/17