[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 59/79] ppc/e500: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 59/79] ppc/e500: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:32 -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>
Acked-by: David Gibson <address@hidden>
---
hw/ppc/e500.c | 5 +----
hw/ppc/e500plat.c | 1 +
hw/ppc/mpc8544ds.c | 1 +
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 960024b611..d5dfe9fb84 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -831,7 +831,6 @@ static void ppce500_power_off(void *opaque, int line, int
on)
void ppce500_init(MachineState *machine)
{
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
PPCE500MachineState *pms = PPCE500_MACHINE(machine);
const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(machine);
PCIBus *pci_bus;
@@ -912,9 +911,7 @@ void ppce500_init(MachineState *machine)
}
/* Register Memory */
- memory_region_allocate_system_memory(ram, NULL, "mpc8544ds.ram",
- machine->ram_size);
- memory_region_add_subregion(address_space_mem, 0, ram);
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
dev = qdev_create(NULL, "e500-ccsr");
object_property_add_child(qdev_get_machine(), "e500-ccsr",
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 7078386300..bddd5e7c48 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -97,6 +97,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void
*data)
mc->init = e500plat_init;
mc->max_cpus = 32;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
+ mc->default_ram_id = "mpc8544ds.ram";
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
}
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index c2c5e11fa1..81177505f0 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -55,6 +55,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void
*data)
mc->init = mpc8544ds_init;
mc->max_cpus = 15;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
+ mc->default_ram_id = "mpc8544ds.ram";
}
#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")
--
2.18.1
- Re: [PATCH v5 52/79] mips/mips_fulong2e: use memdev for RAM, (continued)
- [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, 2020/02/17
- [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 <=
- [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
- [PATCH v5 61/79] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 63/79] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/02/17