[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/22] hw/arm/boot: introduce fdt_add_memory_node hel
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 12/22] hw/arm/boot: introduce fdt_add_memory_node helper |
Date: |
Tue, 5 Mar 2019 16:50:41 +0000 |
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>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
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 d90af2f17d2..a830655e1af 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -423,6 +423,32 @@ 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;
+ 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) {
+ goto out;
+ }
+
+ /* only set the NUMA ID if it is specified */
+ if (numa_node_id >= 0) {
+ ret = qemu_fdt_setprop_cell(fdt, nodename,
+ "numa-node-id", numa_node_id);
+ }
+out:
+ g_free(nodename);
+ return ret;
+}
+
static void fdt_add_psci_node(void *fdt)
{
uint32_t cpu_suspend_fn;
@@ -502,7 +528,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;
@@ -576,35 +601,24 @@ 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);
+ fprintf(stderr, "couldn't add /address@hidden"PRIx64" node\n",
+ mem_base);
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);
+ fprintf(stderr, "couldn't add /address@hidden"PRIx64" node\n",
+ binfo->loader_start);
goto fail;
}
- g_free(nodename);
}
rc = fdt_path_offset(fdt, "/chosen");
--
2.20.1
- [Qemu-devel] [PULL 02/22] target/arm: Split out arm_sctlr, (continued)
- [Qemu-devel] [PULL 02/22] target/arm: Split out arm_sctlr, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 03/22] target/arm: Implement ARMv8.0-SB, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 06/22] target/arm: Add set/clear_pstate_bits, share gen_ss_advance, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 05/22] target/arm: Split helper_msr_i_pstate into 3, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 08/22] target/arm: Implement ARMv8.4-CondM, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 04/22] target/arm: Implement ARMv8.0-PredInv, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 09/22] target/arm: Implement ARMv8.5-CondM, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 11/22] target/arm: Implement ARMv8.5-FRINT, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 07/22] target/arm: Rearrange disas_data_proc_reg, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 10/22] target/arm: Restructure handle_fp_1src_{single, double}, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 12/22] hw/arm/boot: introduce fdt_add_memory_node helper,
Peter Maydell <=
- [Qemu-devel] [PULL 13/22] hw/arm/virt: Rename highmem IO regions, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 14/22] hw/arm/virt: Split the memory map description, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 15/22] hw/boards: Add a MachineState parameter to kvm_type callback, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 17/22] vl: Set machine ram_size, maxram_size and ram_slots earlier, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 18/22] hw/arm/virt: Dynamic memory map depending on RAM requirements, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 19/22] hw/arm/virt: Implement kvm_type function for 4.0 machine, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 20/22] hw/arm/virt: Check the VCPU PA range in TCG mode, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 16/22] kvm: add kvm_arm_get_max_vm_ipa_size, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 22/22] hw/arm/stellaris: Implement watchdog timer, Peter Maydell, 2019/03/05
- [Qemu-devel] [PULL 21/22] hw/arm/virt: Bump the 255GB initial RAM limit, Peter Maydell, 2019/03/05