[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 22/80] arm/musicpal: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 22/80] arm/musicpal: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:37:47 +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.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
* fix format string causing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/arm/musicpal.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index f68a399..c6418b0 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -32,6 +32,7 @@
#include "sysemu/runstate.h"
#include "exec/address-spaces.h"
#include "ui/pixel_ops.h"
+#include "qemu/cutils.h"
#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
@@ -1589,16 +1590,21 @@ static void musicpal_init(MachineState *machine)
int i;
unsigned long flash_size;
DriveInfo *dinfo;
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *sram = g_new(MemoryRegion, 1);
+ /* For now we use a fixed - the original - RAM size */
+ 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);
+ }
+
cpu = ARM_CPU(cpu_create(machine->cpu_type));
- /* For now we use a fixed - the original - RAM size */
- memory_region_allocate_system_memory(ram, NULL, "musicpal.ram",
- MP_RAM_DEFAULT_SIZE);
- memory_region_add_subregion(address_space_mem, 0, ram);
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE,
&error_fatal);
@@ -1714,6 +1720,8 @@ static void musicpal_machine_init(MachineClass *mc)
mc->init = musicpal_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ mc->default_ram_size = MP_RAM_DEFAULT_SIZE;
+ mc->default_ram_id = "musicpal.ram";
}
DEFINE_MACHINE("musicpal", musicpal_machine_init)
--
2.7.4
- [PATCH REPOST v3 16/80] arm/kzm: drop RAM size fixup, (continued)
- [PATCH REPOST v3 16/80] arm/kzm: drop RAM size fixup, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 17/80] arm/kzm: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 20/80] arm/mps2-tz: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 19/80] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 18/80] arm/mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 21/80] arm/mps2: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 22/80] arm/musicpal: use memdev for RAM,
Igor Mammedov <=
- [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