Re: [PATCH] hw/intc: sifive_plic: Renumber the S irqs for numa support

[Alistair Francis]

On Fri, Nov 11, 2022 at 10:20 PM Frédéric Pétrot
<frederic.petrot@univ-grenoble-alpes.fr> wrote:
>
> Commit 40244040 changed the way the S irqs are numbered. This breaks when
> using numa configuration, e.g.:
> ./qemu-system-riscv64 -nographic -machine virt,dumpdtb=numa-tree.dtb \
>                       -m 2G -smp cpus=16 \
>                       -object memory-backend-ram,id=mem0,size=512M \
>                       -object memory-backend-ram,id=mem1,size=512M \
>                       -object memory-backend-ram,id=mem2,size=512M \
>                       -object memory-backend-ram,id=mem3,size=512M \
>                       -numa node,cpus=0-3,memdev=mem0,nodeid=0 \
>                       -numa node,cpus=4-7,memdev=mem1,nodeid=1 \
>                       -numa node,cpus=8-11,memdev=mem2,nodeid=2 \
>                       -numa node,cpus=12-15,memdev=mem3,nodeid=3
> leads to:
> Unexpected error in object_property_find_err() at ../qom/object.c:1304:
> qemu-system-riscv64: Property 'riscv.sifive.plic.unnamed-gpio-out[8]' not
> found
>
> This patch makes the nubering of the S irqs identical to what it was before.
>
> Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  hw/intc/sifive_plic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
> index c2dfacf028..89d2122742 100644
> --- a/hw/intc/sifive_plic.c
> +++ b/hw/intc/sifive_plic.c
> @@ -480,7 +480,7 @@ DeviceState *sifive_plic_create(hwaddr addr, char 
> *hart_config,
>                                    qdev_get_gpio_in(DEVICE(cpu), IRQ_M_EXT));
>          }
>          if (plic->addr_config[i].mode == PLICMode_S) {
> -            qdev_connect_gpio_out(dev, cpu_num,
> +            qdev_connect_gpio_out(dev, cpu_num - plic->hartid_base,
>                                    qdev_get_gpio_in(DEVICE(cpu), IRQ_S_EXT));
>          }
>      }
> --
> 2.37.2
>
>