[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 26/79] arm/omap_sx1: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v6 26/79] arm/omap_sx1: use memdev for RAM |
Date: |
Wed, 19 Feb 2020 11:09:00 -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: Andrew Jones <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
v2:
* fix format string causing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
---
hw/arm/omap_sx1.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index be245714db..2bebab4171 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -35,6 +35,7 @@
#include "sysemu/qtest.h"
#include "exec/address-spaces.h"
#include "cpu.h"
+#include "qemu/cutils.h"
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
@@ -102,8 +103,8 @@ static struct arm_boot_info sx1_binfo = {
static void sx1_init(MachineState *machine, const int version)
{
struct omap_mpu_state_s *mpu;
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
MemoryRegion *address_space = get_system_memory();
- MemoryRegion *dram = g_new(MemoryRegion, 1);
MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *cs = g_new(MemoryRegion, 4);
static uint32_t cs0val = 0x00213090;
@@ -115,15 +116,20 @@ static void sx1_init(MachineState *machine, const int
version)
uint32_t flash_size = flash0_size;
int be;
+ 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);
+ }
+
if (version == 2) {
flash_size = flash2_size;
}
- memory_region_allocate_system_memory(dram, NULL, "omap1.dram",
- sx1_binfo.ram_size);
- memory_region_add_subregion(address_space, OMAP_EMIFF_BASE, dram);
+ memory_region_add_subregion(address_space, OMAP_EMIFF_BASE, machine->ram);
- mpu = omap310_mpu_init(dram, machine->cpu_type);
+ mpu = omap310_mpu_init(machine->ram, machine->cpu_type);
/* External Flash (EMIFS) */
memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size,
@@ -223,6 +229,8 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void
*data)
mc->init = sx1_init_v2;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
+ mc->default_ram_size = sdram_size;
+ mc->default_ram_id = "omap1.dram";
}
static const TypeInfo sx1_machine_v2_type = {
@@ -239,6 +247,8 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void
*data)
mc->init = sx1_init_v1;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
+ mc->default_ram_size = sdram_size;
+ mc->default_ram_id = "omap1.dram";
}
static const TypeInfo sx1_machine_v1_type = {
--
2.18.1
- [PATCH v6 19/79] arm/kzm: use memdev for RAM, (continued)
- [PATCH v6 19/79] arm/kzm: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 17/79] arm/integratorcp: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 18/79] arm/kzm: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 15/79] arm/imx25_pdk: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 21/79] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 22/79] arm/mps2-tz: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 20/79] arm/mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 24/79] arm/musicpal: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 23/79] arm/mps2: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 25/79] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 26/79] arm/omap_sx1: use memdev for RAM,
Igor Mammedov <=
- [PATCH v6 28/79] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 29/79] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/02/19
- [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