| Message ID | 20220805155405.1504081-5-mail@conchuod.ie |
|---|---|
| State | New |
| Headers | show |
| Series | QEMU: Fix RISC-V virt & spike machines' dtbs | expand |
On Sat, Aug 6, 2022 at 2:10 AM Conor Dooley <mail@conchuod.ie> wrote: > > From: Conor Dooley <conor.dooley@microchip.com> > > The subnodes of the syscon have been added to the incorrect paths. > Rather than add them as subnodes, they were originally added to "/foo" > and a later patch moved them to "/soc/foo". Both are incorrect & they > should have been added as "/soc/test@###/foo" as "/soc/test" is the > syscon node. Fix both the reboot and poweroff subnodes to avoid errors > such as: > > /stuff/qemu/qemu.dtb: soc: poweroff: {'value': [[21845]], 'offset': [[0]], 'regmap': [[4]], 'compatible': ['syscon-poweroff']} should not be valid under {'type': 'object'} > From schema: /home/conor/.local/lib/python3.9/site-packages/dtschema/schemas/simple-bus.yaml > /stuff/qemu/qemu.dtb: soc: reboot: {'value': [[30583]], 'offset': [[0]], 'regmap': [[4]], 'compatible': ['syscon-reboot']} should not be valid under {'type': 'object'} > From schema: /home/conor/.local/lib/python3.9/site-packages/dtschema/schemas/simple-bus.yaml > > Reported-by: Rob Herring <robh@kernel.org> > Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ > Fixes: 18df0b4695 ("hw/riscv: virt: Allow creating multiple NUMA sockets") > Fixes: 0e404da007 ("riscv/virt: Add syscon reboot and poweroff DT nodes") > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/virt.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 8b2978076e..a98b054545 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -896,7 +896,8 @@ static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap, > test_phandle = qemu_fdt_get_phandle(mc->fdt, name); > g_free(name); > > - name = g_strdup_printf("/soc/reboot"); > + name = g_strdup_printf("/soc/test@%lx/reboot", > + (long)memmap[VIRT_TEST].base); > qemu_fdt_add_subnode(mc->fdt, name); > qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-reboot"); > qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle); > @@ -904,7 +905,8 @@ static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap, > qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_RESET); > g_free(name); > > - name = g_strdup_printf("/soc/poweroff"); > + name = g_strdup_printf("/soc/test@%lx/poweroff", > + (long)memmap[VIRT_TEST].base); > qemu_fdt_add_subnode(mc->fdt, name); > qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-poweroff"); > qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle); > -- > 2.37.1 > >
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 8b2978076e..a98b054545 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -896,7 +896,8 @@ static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap, test_phandle = qemu_fdt_get_phandle(mc->fdt, name); g_free(name); - name = g_strdup_printf("/soc/reboot"); + name = g_strdup_printf("/soc/test@%lx/reboot", + (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(mc->fdt, name); qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-reboot"); qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle); @@ -904,7 +905,8 @@ static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap, qemu_fdt_setprop_cell(mc->fdt, name, "value", FINISHER_RESET); g_free(name); - name = g_strdup_printf("/soc/poweroff"); + name = g_strdup_printf("/soc/test@%lx/poweroff", + (long)memmap[VIRT_TEST].base); qemu_fdt_add_subnode(mc->fdt, name); qemu_fdt_setprop_string(mc->fdt, name, "compatible", "syscon-poweroff"); qemu_fdt_setprop_cell(mc->fdt, name, "regmap", test_phandle);