[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 36/79] arm/xlnx-versal-virt: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 36/79] arm/xlnx-versal-virt: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:09 -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/arm/xlnx-versal-virt.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 462493c467..c137ff4def 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -30,7 +30,6 @@ typedef struct VersalVirt {
MachineState parent_obj;
Versal soc;
- MemoryRegion mr_ddr;
void *fdt;
int fdt_size;
@@ -414,12 +413,9 @@ static void versal_virt_init(MachineState *machine)
psci_conduit = QEMU_PSCI_CONDUIT_SMC;
}
- memory_region_allocate_system_memory(&s->mr_ddr, NULL, "ddr",
- machine->ram_size);
-
sysbus_init_child_obj(OBJECT(machine), "xlnx-ve", &s->soc,
sizeof(s->soc), TYPE_XLNX_VERSAL);
- object_property_set_link(OBJECT(&s->soc), OBJECT(&s->mr_ddr),
+ object_property_set_link(OBJECT(&s->soc), OBJECT(machine->ram),
"ddr", &error_abort);
object_property_set_int(OBJECT(&s->soc), psci_conduit,
"psci-conduit", &error_abort);
@@ -473,6 +469,7 @@ static void versal_virt_machine_class_init(ObjectClass *oc,
void *data)
mc->max_cpus = XLNX_VERSAL_NR_ACPUS;
mc->default_cpus = XLNX_VERSAL_NR_ACPUS;
mc->no_cdrom = true;
+ mc->default_ram_id = "ddr";
}
static const TypeInfo versal_virt_machine_init_typeinfo = {
--
2.18.1
- Re: [PATCH v5 27/79] arm/palm: use memdev for RAM, (continued)
- [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
- [PATCH v5 31/79] arm/versatilepb: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 36/79] arm/xlnx-versal-virt: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 34/79] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 39/79] null-machine: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 30/79] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/02/17