On Thu, Jul 27, 2023 at 10:37 AM Conor Dooley <co...@kernel.org> wrote:
>
> From: Conor Dooley <conor.doo...@microchip.com>
>
> On a dtb dumped from the virt machine, dt-validate complains:
> soc: pmu: {'riscv,event-to-mhpmcounters': [[1, 1, 524281], [2, 2, 524284],
> [65561, 65561, 524280], [65563, 65563, 524280], [65569, 65569, 524280]],
> 'compatible': ['riscv,pmu']} should not be valid under {'type': 'object'}
> from schema $id: http://devicetree.org/schemas/simple-bus.yaml#
> That's pretty cryptic, but running the dtb back through dtc produces
> something a lot more reasonable:
> Warning (simple_bus_reg): /soc/pmu: missing or empty reg/ranges property
>
> Moving the riscv,pmu node out of the soc bus solves the problem.
>
> Signed-off-by: Conor Dooley <conor.doo...@microchip.com>
Acked-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> CC: Palmer Dabbelt <pal...@dabbelt.com>
> CC: Alistair Francis <alistair.fran...@wdc.com>
> CC: Bin Meng <bin.m...@windriver.com>
> CC: Weiwei Li <liwei...@iscas.ac.cn>
> CC: Daniel Henrique Barboza <dbarb...@ventanamicro.com>
> CC: Liu Zhiwei <zhiwei_...@linux.alibaba.com>
> CC: qemu-ri...@nongnu.org
> CC: qemu-devel@nongnu.org
> ---
> hw/riscv/virt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index d90286dc46..25dcc2616e 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -732,7 +732,7 @@ static void create_fdt_pmu(RISCVVirtState *s)
> MachineState *ms = MACHINE(s);
> RISCVCPU hart = s->soc[0].harts[0];
>
> - pmu_name = g_strdup_printf("/soc/pmu");
> + pmu_name = g_strdup_printf("/pmu");
> qemu_fdt_add_subnode(ms->fdt, pmu_name);
> qemu_fdt_setprop_string(ms->fdt, pmu_name, "compatible", "riscv,pmu");
> riscv_pmu_generate_fdt_node(ms->fdt, hart.cfg.pmu_num, pmu_name);
> --
> 2.39.2
>
>
