OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/boot: introduce fdt_add_memory_node helper

Browse Source 
We introduce an helper to create a memory node.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190304101339.25970-2-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Shameer Kolothum 2019-03-04 11:13:30 +01:00 committed by Peter Maydell
parent 6bea25631a
commit f08ced69d3
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
hw/arm/boot.c
View File

@ -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("/memory@%" 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) static void fdt_add_psci_node(void *fdt)
{ {
uint32_t cpu_suspend_fn; uint32_t cpu_suspend_fn;
@ -502,7 +528,6 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
void *fdt = NULL; void *fdt = NULL;
int size, rc, n = 0; int size, rc, n = 0;
uint32_t acells, scells; uint32_t acells, scells;
char *nodename;
unsigned int i; unsigned int i;
hwaddr mem_base, mem_len; hwaddr mem_base, mem_len;
char **node_path; char **node_path;
@ -576,35 +601,24 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
mem_base = binfo->loader_start; mem_base = binfo->loader_start;
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
mem_len = numa_info[i].node_mem; mem_len = numa_info[i].node_mem;
nodename = g_strdup_printf("/memory@%" PRIx64, mem_base); rc = fdt_add_memory_node(fdt, acells, mem_base,
qemu_fdt_add_subnode(fdt, nodename); scells, mem_len, i);
qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
acells, mem_base,
scells, mem_len);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename, fprintf(stderr, "couldn't add /memory@%"PRIx64" node\n",
i); mem_base);
goto fail; goto fail;
} }
qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i);
mem_base += mem_len; mem_base += mem_len;
g_free(nodename);
} }
} else { } else {
nodename = g_strdup_printf("/memory@%" PRIx64, binfo->loader_start); rc = fdt_add_memory_node(fdt, acells, binfo->loader_start,
qemu_fdt_add_subnode(fdt, nodename); scells, binfo->ram_size, -1);
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);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "couldn't set %s reg\n", nodename); fprintf(stderr, "couldn't add /memory@%"PRIx64" node\n",
binfo->loader_start);
goto fail; goto fail;
} }
g_free(nodename);
} }
rc = fdt_path_offset(fdt, "/chosen"); rc = fdt_path_offset(fdt, "/chosen");