[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 55/79] mips/mips_malta: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 55/79] mips/mips_malta: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:28 -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.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/mips/mips_malta.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 34b76bb6a1..6e7ba9235d 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1224,7 +1224,6 @@ void mips_malta_init(MachineState *machine)
char *filename;
PFlashCFI01 *fl;
MemoryRegion *system_memory = get_system_memory();
- MemoryRegion *ram_high = g_new(MemoryRegion, 1);
MemoryRegion *ram_low_preio = g_new(MemoryRegion, 1);
MemoryRegion *ram_low_postio;
MemoryRegion *bios, *bios_copy = g_new(MemoryRegion, 1);
@@ -1262,13 +1261,11 @@ void mips_malta_init(MachineState *machine)
}
/* register RAM at high address where it is undisturbed by IO */
- memory_region_allocate_system_memory(ram_high, NULL, "mips_malta.ram",
- ram_size);
- memory_region_add_subregion(system_memory, 0x80000000, ram_high);
+ memory_region_add_subregion(system_memory, 0x80000000, machine->ram);
/* alias for pre IO hole access */
memory_region_init_alias(ram_low_preio, NULL, "mips_malta_low_preio.ram",
- ram_high, 0, MIN(ram_size, 256 * MiB));
+ machine->ram, 0, MIN(ram_size, 256 * MiB));
memory_region_add_subregion(system_memory, 0, ram_low_preio);
/* alias for post IO hole access, if there is enough RAM */
@@ -1276,7 +1273,7 @@ void mips_malta_init(MachineState *machine)
ram_low_postio = g_new(MemoryRegion, 1);
memory_region_init_alias(ram_low_postio, NULL,
"mips_malta_low_postio.ram",
- ram_high, 512 * MiB,
+ machine->ram, 512 * MiB,
ram_size - 512 * MiB);
memory_region_add_subregion(system_memory, 512 * MiB,
ram_low_postio);
@@ -1448,6 +1445,7 @@ static void mips_malta_machine_init(MachineClass *mc)
#else
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
#endif
+ mc->default_ram_id = "mips_malta.ram";
}
DEFINE_MACHINE("malta", mips_malta_machine_init)
--
2.18.1
- Re: [PATCH v5 46/79] m68k/an5206: use memdev for RAM, (continued)
- [PATCH v5 48/79] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 50/79] mips/boston: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 49/79] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 52/79] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 51/79] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 53/79] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 54/79] mips/mips_jazz: add max ram size check, Igor Mammedov, 2020/02/17
- [PATCH v5 55/79] mips/mips_malta: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 56/79] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 58/79] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 57/79] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 59/79] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 62/79] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 60/79] ppc/mac_newworld: use memdev for RAM, Igor Mammedov, 2020/02/17