Re: [PATCH 05/13] hw/riscv/virt: Use setprop_sized_cells for aclint

[Daniel Henrique Barboza]

On 4/29/25 3:12 AM, Joel Stanley wrote:
> The current device tree property uses two cells for the address (and for
> the size), but assumes the they are less than 32 bits by hard coding the
> high cell to zero.
>
> Use qemu_fdt_setprop_sized_cells to do the job of splitting the upper
> and lower 32 bits across cells.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---

Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>

>   hw/riscv/virt.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 62200ea39d07..0141ea4795e5 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -387,8 +387,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
>           qemu_fdt_add_subnode(ms->fdt, name);
>           qemu_fdt_setprop_string(ms->fdt, name, "compatible",
>               "riscv,aclint-mswi");
> -        qemu_fdt_setprop_cells(ms->fdt, name, "reg",
> -            0x0, addr, 0x0, RISCV_ACLINT_SWI_SIZE);
> +        qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
> +            2, addr, 2, RISCV_ACLINT_SWI_SIZE);
>           qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
>               aclint_mswi_cells, aclint_cells_size);
>           qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0);
> @@ -410,11 +410,11 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
>       qemu_fdt_add_subnode(ms->fdt, name);
>       qemu_fdt_setprop_string(ms->fdt, name, "compatible",
>           "riscv,aclint-mtimer");
> -    qemu_fdt_setprop_cells(ms->fdt, name, "reg",
> -        0x0, addr + RISCV_ACLINT_DEFAULT_MTIME,
> -        0x0, size - RISCV_ACLINT_DEFAULT_MTIME,
> -        0x0, addr + RISCV_ACLINT_DEFAULT_MTIMECMP,
> -        0x0, RISCV_ACLINT_DEFAULT_MTIME);
> +    qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
> +        2, addr + RISCV_ACLINT_DEFAULT_MTIME,
> +        2, size - RISCV_ACLINT_DEFAULT_MTIME,
> +        2, addr + RISCV_ACLINT_DEFAULT_MTIMECMP,
> +        2, RISCV_ACLINT_DEFAULT_MTIME);
>       qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
>           aclint_mtimer_cells, aclint_cells_size);
>       riscv_socket_fdt_write_id(ms, name, socket);
> @@ -428,8 +428,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
>           qemu_fdt_add_subnode(ms->fdt, name);
>           qemu_fdt_setprop_string(ms->fdt, name, "compatible",
>               "riscv,aclint-sswi");
> -        qemu_fdt_setprop_cells(ms->fdt, name, "reg",
> -            0x0, addr, 0x0, s->memmap[VIRT_ACLINT_SSWI].size);
> +        qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg",
> +            2, addr, 2, s->memmap[VIRT_ACLINT_SSWI].size);
>           qemu_fdt_setprop(ms->fdt, name, "interrupts-extended",
>               aclint_sswi_cells, aclint_cells_size);
>           qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0);