[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 08/15] hw/arm/boot: introduce fdt_add_memory_node h
From: |
Eric Auger |
Subject: |
[Qemu-devel] [RFC v2 08/15] hw/arm/boot: introduce fdt_add_memory_node helper |
Date: |
Mon, 2 Jul 2018 19:22:35 +0200 |
From: Shameer Kolothum <address@hidden>
We introduce an helper to create a memory node.
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
---
v1 -> v2:
- nop of existing /memory nodes was already handled
---
hw/arm/boot.c | 54 ++++++++++++++++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index e09201c..5243a25 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -413,6 +413,36 @@ static void set_kernel_args_old(const struct arm_boot_info
*info,
}
}
+static int fdt_add_memory_node(void *fdt, uint32_t acells, hwaddr mem_base,
+ uint32_t scells, hwaddr mem_len,
+ int numa_node_id)
+{
+ char *nodename = NULL;
+ int ret;
+
+ nodename = g_strdup_printf("/address@hidden" PRIx64, mem_base);
+ qemu_fdt_add_subnode(fdt, nodename);
+ qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
+ ret = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", acells, mem_base,
+ scells, mem_len);
+ if (ret < 0) {
+ fprintf(stderr, "couldn't set %s/reg\n", nodename);
+ goto out;
+ }
+ if (numa_node_id < 0) {
+ goto out;
+ }
+
+ ret = qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", numa_node_id);
+ if (ret < 0) {
+ fprintf(stderr, "couldn't set %s/numa-node-id\n", nodename);
+ }
+
+out:
+ g_free(nodename);
+ return ret;
+}
+
static void fdt_add_psci_node(void *fdt)
{
uint32_t cpu_suspend_fn;
@@ -492,7 +522,6 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info
*binfo,
void *fdt = NULL;
int size, rc, n = 0;
uint32_t acells, scells;
- char *nodename;
unsigned int i;
hwaddr mem_base, mem_len;
char **node_path;
@@ -566,35 +595,20 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info
*binfo,
mem_base = binfo->loader_start;
for (i = 0; i < nb_numa_nodes; i++) {
mem_len = numa_info[i].node_mem;
- nodename = g_strdup_printf("/address@hidden" PRIx64, mem_base);
- qemu_fdt_add_subnode(fdt, nodename);
- qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
- rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
- acells, mem_base,
- scells, mem_len);
+ rc = fdt_add_memory_node(fdt, acells, mem_base,
+ scells, mem_len, i);
if (rc < 0) {
- fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename,
- i);
goto fail;
}
- qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i);
mem_base += mem_len;
- g_free(nodename);
}
} else {
- nodename = g_strdup_printf("/address@hidden" PRIx64,
binfo->loader_start);
- qemu_fdt_add_subnode(fdt, nodename);
- qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
-
- rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
- acells, binfo->loader_start,
- scells, binfo->ram_size);
+ rc = fdt_add_memory_node(fdt, acells, binfo->loader_start,
+ scells, binfo->ram_size, -1);
if (rc < 0) {
- fprintf(stderr, "couldn't set %s reg\n", nodename);
goto fail;
}
- g_free(nodename);
}
rc = fdt_path_offset(fdt, "/chosen");
--
2.5.5
- [Qemu-devel] [RFC v2 00/15] ARM virt: PCDIMM/NVDIMM at 2TB, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 02/15] hw/boards: Add a MachineState parameter to kvm_type callback, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 01/15] linux-headers: header update for KVM/ARM KVM_ARM_GET_MAX_VM_PHYS_SHIFT, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 03/15] kvm: add kvm_arm_get_max_vm_phys_shift, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 05/15] hw/arm/virt: handle max_vm_phys_shift conflicts on migration, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 04/15] hw/arm/virt: support kvm_type property, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 07/15] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 06/15] hw/arm/virt: Allocate device_memory, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 08/15] hw/arm/boot: introduce fdt_add_memory_node helper,
Eric Auger <=
- [Qemu-devel] [RFC v2 11/15] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 10/15] acpi: move build_srat_hotpluggable_memory to generic ACPI source, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 09/15] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 12/15] nvdimm: use configurable ACPI IO base and size, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 13/15] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 14/15] hw/arm/boot: Expose the pmem nodes in the DT, Eric Auger, 2018/07/02
- [Qemu-devel] [RFC v2 15/15] hw/arm/virt: Add nvdimm and nvdimm-persistence options, Eric Auger, 2018/07/02
- Re: [Qemu-devel] [RFC v2 00/15] ARM virt: PCDIMM/NVDIMM at 2TB, no-reply, 2018/07/03