| Message ID | 20221113095101.3395628-1-atishp@rivosinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] hw/riscv: virt: Remove the redundant ipi-id property | expand |
On Sun, Nov 13, 2022 at 7:52 PM Atish Patra <atishp@rivosinc.com> wrote: > > The imsic DT binding[1] has changed and no longer require an ipi-id. > The latest IMSIC driver dynamically allocates ipi id if slow-ipi > is not defined. > > Get rid of the unused dt property which may lead to confusion. > > [1] https://lore.kernel.org/lkml/20221111044207.1478350-5-apatel@ventanamicro.com/ > > Signed-off-by: Atish Patra <atishp@rivosinc.com> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/virt.c | 2 -- > include/hw/riscv/virt.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a5bc7353b412..0bc0964e42a8 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -546,8 +546,6 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, > riscv_socket_count(mc) * sizeof(uint32_t) * 4); > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,num-ids", > VIRT_IRQCHIP_NUM_MSIS); > - qemu_fdt_setprop_cells(mc->fdt, imsic_name, "riscv,ipi-id", > - VIRT_IRQCHIP_IPI_MSI); > if (riscv_socket_count(mc) > 1) { > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,hart-index-bits", > imsic_num_bits(imsic_max_hart_per_socket)); > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index be4ab8fe7f71..62513e075c47 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -93,7 +93,6 @@ enum { > > #define VIRT_PLATFORM_BUS_NUM_IRQS 32 > > -#define VIRT_IRQCHIP_IPI_MSI 1 > #define VIRT_IRQCHIP_NUM_MSIS 255 > #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV > #define VIRT_IRQCHIP_NUM_PRIO_BITS 3 > -- > 2.25.1 > >
On Sun, Nov 13, 2022 at 7:52 PM Atish Patra <atishp@rivosinc.com> wrote: > > The imsic DT binding[1] has changed and no longer require an ipi-id. > The latest IMSIC driver dynamically allocates ipi id if slow-ipi > is not defined. > > Get rid of the unused dt property which may lead to confusion. > > [1] https://lore.kernel.org/lkml/20221111044207.1478350-5-apatel@ventanamicro.com/ > > Signed-off-by: Atish Patra <atishp@rivosinc.com> Thanks! Applied to riscv-to-apply.next Alistair > --- > hw/riscv/virt.c | 2 -- > include/hw/riscv/virt.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a5bc7353b412..0bc0964e42a8 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -546,8 +546,6 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, > riscv_socket_count(mc) * sizeof(uint32_t) * 4); > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,num-ids", > VIRT_IRQCHIP_NUM_MSIS); > - qemu_fdt_setprop_cells(mc->fdt, imsic_name, "riscv,ipi-id", > - VIRT_IRQCHIP_IPI_MSI); > if (riscv_socket_count(mc) > 1) { > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,hart-index-bits", > imsic_num_bits(imsic_max_hart_per_socket)); > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index be4ab8fe7f71..62513e075c47 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -93,7 +93,6 @@ enum { > > #define VIRT_PLATFORM_BUS_NUM_IRQS 32 > > -#define VIRT_IRQCHIP_IPI_MSI 1 > #define VIRT_IRQCHIP_NUM_MSIS 255 > #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV > #define VIRT_IRQCHIP_NUM_PRIO_BITS 3 > -- > 2.25.1 > >
On Sun, Nov 13, 2022 at 7:52 PM Atish Patra <atishp@rivosinc.com> wrote: > > The imsic DT binding[1] has changed and no longer require an ipi-id. > The latest IMSIC driver dynamically allocates ipi id if slow-ipi > is not defined. > > Get rid of the unused dt property which may lead to confusion. > > [1] https://lore.kernel.org/lkml/20221111044207.1478350-5-apatel@ventanamicro.com/ > > Signed-off-by: Atish Patra <atishp@rivosinc.com> > --- > hw/riscv/virt.c | 2 -- > include/hw/riscv/virt.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a5bc7353b412..0bc0964e42a8 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -546,8 +546,6 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, > riscv_socket_count(mc) * sizeof(uint32_t) * 4); > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,num-ids", > VIRT_IRQCHIP_NUM_MSIS); > - qemu_fdt_setprop_cells(mc->fdt, imsic_name, "riscv,ipi-id", > - VIRT_IRQCHIP_IPI_MSI); > if (riscv_socket_count(mc) > 1) { > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,hart-index-bits", > imsic_num_bits(imsic_max_hart_per_socket)); > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index be4ab8fe7f71..62513e075c47 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -93,7 +93,6 @@ enum { > > #define VIRT_PLATFORM_BUS_NUM_IRQS 32 > > -#define VIRT_IRQCHIP_IPI_MSI 1 This is used elsewhere with a different "riscv,ipi-id" and this fails to compile I have dropped this patch Alistair > #define VIRT_IRQCHIP_NUM_MSIS 255 > #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV > #define VIRT_IRQCHIP_NUM_PRIO_BITS 3 > -- > 2.25.1 > >
On Mon, Nov 21, 2022 at 10:11 PM Alistair Francis <alistair23@gmail.com> wrote: > > On Sun, Nov 13, 2022 at 7:52 PM Atish Patra <atishp@rivosinc.com> wrote: > > > > The imsic DT binding[1] has changed and no longer require an ipi-id. > > The latest IMSIC driver dynamically allocates ipi id if slow-ipi > > is not defined. > > > > Get rid of the unused dt property which may lead to confusion. > > > > [1] https://lore.kernel.org/lkml/20221111044207.1478350-5-apatel@ventanamicro.com/ > > > > Signed-off-by: Atish Patra <atishp@rivosinc.com> > > --- > > hw/riscv/virt.c | 2 -- > > include/hw/riscv/virt.h | 1 - > > 2 files changed, 3 deletions(-) > > > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > > index a5bc7353b412..0bc0964e42a8 100644 > > --- a/hw/riscv/virt.c > > +++ b/hw/riscv/virt.c > > @@ -546,8 +546,6 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, > > riscv_socket_count(mc) * sizeof(uint32_t) * 4); > > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,num-ids", > > VIRT_IRQCHIP_NUM_MSIS); > > - qemu_fdt_setprop_cells(mc->fdt, imsic_name, "riscv,ipi-id", > > - VIRT_IRQCHIP_IPI_MSI); > > if (riscv_socket_count(mc) > 1) { > > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,hart-index-bits", > > imsic_num_bits(imsic_max_hart_per_socket)); > > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > > index be4ab8fe7f71..62513e075c47 100644 > > --- a/include/hw/riscv/virt.h > > +++ b/include/hw/riscv/virt.h > > @@ -93,7 +93,6 @@ enum { > > > > #define VIRT_PLATFORM_BUS_NUM_IRQS 32 > > > > -#define VIRT_IRQCHIP_IPI_MSI 1 > > This is used elsewhere with a different "riscv,ipi-id" and this fails to compile > I am not sure what I was thinking when I sent the patch. It is such a silly patch. Anyways, I am really sorry for the breakage. I have sent the v3. > I have dropped this patch > > Alistair > > > #define VIRT_IRQCHIP_NUM_MSIS 255 > > #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV > > #define VIRT_IRQCHIP_NUM_PRIO_BITS 3 > > -- > > 2.25.1 > > > >
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index a5bc7353b412..0bc0964e42a8 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -546,8 +546,6 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap, riscv_socket_count(mc) * sizeof(uint32_t) * 4); qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,num-ids", VIRT_IRQCHIP_NUM_MSIS); - qemu_fdt_setprop_cells(mc->fdt, imsic_name, "riscv,ipi-id", - VIRT_IRQCHIP_IPI_MSI); if (riscv_socket_count(mc) > 1) { qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,hart-index-bits", imsic_num_bits(imsic_max_hart_per_socket)); diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index be4ab8fe7f71..62513e075c47 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -93,7 +93,6 @@ enum { #define VIRT_PLATFORM_BUS_NUM_IRQS 32 -#define VIRT_IRQCHIP_IPI_MSI 1 #define VIRT_IRQCHIP_NUM_MSIS 255 #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV #define VIRT_IRQCHIP_NUM_PRIO_BITS 3
The imsic DT binding[1] has changed and no longer require an ipi-id. The latest IMSIC driver dynamically allocates ipi id if slow-ipi is not defined. Get rid of the unused dt property which may lead to confusion. [1] https://lore.kernel.org/lkml/20221111044207.1478350-5-apatel@ventanamicro.com/ Signed-off-by: Atish Patra <atishp@rivosinc.com> --- hw/riscv/virt.c | 2 -- include/hw/riscv/virt.h | 1 - 2 files changed, 3 deletions(-)