[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 29/79] arm/raspi: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 29/79] arm/raspi: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:02 -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>
---
CC: address@hidden
CC: address@hidden
v5:
* fixed rebase conflicts once more
v4:
* fixed rebase conflicts
---
hw/arm/raspi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 90ad9b8115..acd2bb794d 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -39,7 +39,6 @@ typedef struct RaspiMachineState {
MachineState parent_obj;
/*< public >*/
BCM283XState soc;
- MemoryRegion ram;
} RaspiMachineState;
typedef struct RaspiMachineClass {
@@ -277,16 +276,14 @@ static void raspi_machine_init(MachineState *machine)
exit(1);
}
- /* Allocate and map RAM */
- memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
- machine->ram_size);
/* FIXME: Remove when we have custom CPU address space support */
- memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0);
+ memory_region_add_subregion_overlap(get_system_memory(), 0,
+ machine->ram, 0);
/* Setup the SOC */
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
board_soc_type(board_rev), &error_abort, NULL);
- object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
+ object_property_add_const_link(OBJECT(&s->soc), "ram",
OBJECT(machine->ram),
&error_abort);
object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
&error_abort);
@@ -324,6 +321,7 @@ static void raspi_machine_class_init(ObjectClass *oc, void
*data)
mc->no_cdrom = 1;
mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev);
mc->default_ram_size = board_ram_size(board_rev);
+ mc->default_ram_id = "ram";
if (board_version(board_rev) == 2) {
mc->ignore_memory_transaction_failures = true;
}
--
2.18.1
- [PATCH v5 21/79] arm/mcimx7d-sabre: 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, 2020/02/17
- [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 <=
- [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, 2020/02/17
- [PATCH v5 34/79] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/02/17