[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 09/80] arm/collie: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 09/80] arm/collie: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:37:34 +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.
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>
---
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
CC: 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 970a440..024893f 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.7.4
- [PATCH REPOST v3 00/80] refactor main RAM allocation to use hostmem backend, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 02/80] machine: introduce memory-backend property, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 01/80] numa: remove deprecated -mem-path fallback to anonymous RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 03/80] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 04/80] machine: introduce convenience MachineState::ram, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 05/80] initialize MachineState::ram in NUMA case, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 06/80] alpha:dp264: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 10/80] arm/cubieboard: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 07/80] arm/aspeed: actually check RAM size, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 09/80] arm/collie: use memdev for RAM,
Igor Mammedov <=
- [PATCH REPOST v3 08/80] arm/aspeed: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 11/80] arm/digic_boards: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 12/80] arm/highbank: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 14/80] arm/imx25_pdk: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 13/80] arm/imx25_pdk: drop RAM size fixup, Igor Mammedov, 2020/01/23