hw/arm/virt: Silence dtc /memory warning
When running dtc on the guest /proc/device-tree we get the following warning: Warning (unit_address_vs_reg): Node /memory has a reg or ranges property, but no unit name". Let's fix that by adding the unit address to the node name. We also don't create the /memory node anymore in create_fdt(). We directly create it in load_dtb. /chosen still needs to be created in create_fdt as the uart needs it. In case the user provided his own dtb, we nop all memory nodes found in root and create new one(s). Signed-off-by: Eric Auger <eric.auger@redhat.com> Message-id: 1530044492-24921-4-git-send-email-eric.auger@redhat.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
bb2a33486f
commit
e2eb3d29d7
|
@ -490,11 +490,13 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
|
||||||
hwaddr addr_limit, AddressSpace *as)
|
hwaddr addr_limit, AddressSpace *as)
|
||||||
{
|
{
|
||||||
void *fdt = NULL;
|
void *fdt = NULL;
|
||||||
int size, rc;
|
int size, rc, n = 0;
|
||||||
uint32_t acells, scells;
|
uint32_t acells, scells;
|
||||||
char *nodename;
|
char *nodename;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
hwaddr mem_base, mem_len;
|
hwaddr mem_base, mem_len;
|
||||||
|
char **node_path;
|
||||||
|
Error *err = NULL;
|
||||||
|
|
||||||
if (binfo->dtb_filename) {
|
if (binfo->dtb_filename) {
|
||||||
char *filename;
|
char *filename;
|
||||||
|
@ -546,12 +548,21 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* nop all root nodes matching /memory or /memory@unit-address */
|
||||||
|
node_path = qemu_fdt_node_unit_path(fdt, "memory", &err);
|
||||||
|
if (err) {
|
||||||
|
error_report_err(err);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
while (node_path[n]) {
|
||||||
|
if (g_str_has_prefix(node_path[n], "/memory")) {
|
||||||
|
qemu_fdt_nop_node(fdt, node_path[n]);
|
||||||
|
}
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
g_strfreev(node_path);
|
||||||
|
|
||||||
if (nb_numa_nodes > 0) {
|
if (nb_numa_nodes > 0) {
|
||||||
/*
|
|
||||||
* Turn the /memory node created before into a NOP node, then create
|
|
||||||
* /memory@addr nodes for all numa nodes respectively.
|
|
||||||
*/
|
|
||||||
qemu_fdt_nop_node(fdt, "/memory");
|
|
||||||
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;
|
||||||
|
@ -572,24 +583,18 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
|
||||||
g_free(nodename);
|
g_free(nodename);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Error *err = NULL;
|
nodename = g_strdup_printf("/memory@%" PRIx64, binfo->loader_start);
|
||||||
|
qemu_fdt_add_subnode(fdt, nodename);
|
||||||
|
qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");
|
||||||
|
|
||||||
rc = fdt_path_offset(fdt, "/memory");
|
rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
|
||||||
if (rc < 0) {
|
|
||||||
qemu_fdt_add_subnode(fdt, "/memory");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!qemu_fdt_getprop(fdt, "/memory", "device_type", NULL, &err)) {
|
|
||||||
qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory");
|
|
||||||
}
|
|
||||||
|
|
||||||
rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg",
|
|
||||||
acells, binfo->loader_start,
|
acells, binfo->loader_start,
|
||||||
scells, binfo->ram_size);
|
scells, binfo->ram_size);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
fprintf(stderr, "couldn't set /memory/reg\n");
|
fprintf(stderr, "couldn't set %s reg\n", nodename);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
g_free(nodename);
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = fdt_path_offset(fdt, "/chosen");
|
rc = fdt_path_offset(fdt, "/chosen");
|
||||||
|
|
|
@ -204,13 +204,8 @@ static void create_fdt(VirtMachineState *vms)
|
||||||
qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);
|
qemu_fdt_setprop_cell(fdt, "/", "#address-cells", 0x2);
|
||||||
qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2);
|
qemu_fdt_setprop_cell(fdt, "/", "#size-cells", 0x2);
|
||||||
|
|
||||||
/*
|
/* /chosen must exist for load_dtb to fill in necessary properties later */
|
||||||
* /chosen and /memory nodes must exist for load_dtb
|
|
||||||
* to fill in necessary properties later
|
|
||||||
*/
|
|
||||||
qemu_fdt_add_subnode(fdt, "/chosen");
|
qemu_fdt_add_subnode(fdt, "/chosen");
|
||||||
qemu_fdt_add_subnode(fdt, "/memory");
|
|
||||||
qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory");
|
|
||||||
|
|
||||||
/* Clock node, for the benefit of the UART. The kernel device tree
|
/* Clock node, for the benefit of the UART. The kernel device tree
|
||||||
* binding documentation claims the PL011 node clock properties are
|
* binding documentation claims the PL011 node clock properties are
|
||||||
|
|
Loading…
Reference in a new issue