[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 58/80] ppc/e500: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 58/80] ppc/e500: use memdev for RAM |
Date: |
Fri, 31 Jan 2020 16:09:28 +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.
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 960024b..d5dfe9f 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 7078386..bddd5e7 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 c2c5e11..8117750 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.7.4
- [PATCH v4 49/80] m68k/next-cube: use memdev for RAM, (continued)
- [PATCH v4 49/80] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 50/80] mips/boston: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 44/80] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 46/80] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 47/80] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 48/80] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 51/80] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 55/80] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 52/80] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 53/80] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 58/80] ppc/e500: use memdev for RAM,
Igor Mammedov <=
- [PATCH v4 57/80] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 56/80] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 54/80] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 60/80] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 61/80] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 63/80] ppc/ppc405_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 67/80] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 59/80] ppc/mac_newworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 66/80] ppc/prep: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/31