[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 27/79] arm/palm: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 27/79] arm/palm: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34: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>
---
v2:
* fix format string causing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
CC: address@hidden
---
hw/arm/palm.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 72eca8cc55..388b2629a5 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -31,6 +31,7 @@
#include "hw/loader.h"
#include "exec/address-spaces.h"
#include "cpu.h"
+#include "qemu/cutils.h"
static uint64_t static_read(void *opaque, hwaddr offset, unsigned size)
{
@@ -181,7 +182,6 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *cpu)
static struct arm_boot_info palmte_binfo = {
.loader_start = OMAP_EMIFF_BASE,
- .ram_size = 0x02000000,
.board_id = 0x331,
};
@@ -195,15 +195,21 @@ static void palmte_init(MachineState *machine)
static uint32_t cs2val = 0x0000e1a0;
static uint32_t cs3val = 0xe1a0e1a0;
int rom_size, rom_loaded = 0;
- MemoryRegion *dram = g_new(MemoryRegion, 1);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *cs = g_new(MemoryRegion, 4);
- memory_region_allocate_system_memory(dram, NULL, "omap1.dram",
- palmte_binfo.ram_size);
- memory_region_add_subregion(address_space_mem, OMAP_EMIFF_BASE, dram);
+ 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);
+ }
+
+ memory_region_add_subregion(address_space_mem, 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, "palmte.flash", flash_size,
@@ -265,6 +271,8 @@ static void palmte_machine_init(MachineClass *mc)
mc->init = palmte_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
+ mc->default_ram_size = 0x02000000;
+ mc->default_ram_id = "omap1.dram";
}
DEFINE_MACHINE("cheetah", palmte_machine_init)
--
2.18.1
- Re: [PATCH v5 24/79] arm/musicpal: use memdev for RAM, (continued)
[PATCH v5 21/79] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/02/17
[PATCH v5 25/79] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/02/17
[PATCH v5 26/79] arm/omap_sx1: use memdev for RAM, Igor Mammedov, 2020/02/17
[PATCH v5 27/79] arm/palm: use memdev for RAM,
Igor Mammedov <=
[PATCH v5 28/79] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/02/17
[PATCH v5 29/79] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/02/17
[PATCH v5 33/79] arm/virt: use memdev for RAM, Igor Mammedov, 2020/02/17