| Message ID | 20221122080529.1692533-1-atishp@rivosinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] hw/riscv: virt: Remove the redundant ipi-id property | expand |
On Tue, Nov 22, 2022 at 6:07 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> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > Changes from v2->v3: > 1. Fix the compilation issue by removing the other usage of > VIRT_IRQCHIP_IPI_MSI > > --- > --- > hw/riscv/virt.c | 4 ---- > include/hw/riscv/virt.h | 1 - > 2 files changed, 5 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a5bc7353b412..6cf9355b99b6 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)); > @@ -597,8 +595,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 (imsic_guest_bits) { > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,guest-index-bits", > imsic_guest_bits); > 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 Tue, Nov 22, 2022 at 6:07 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 > --- > Changes from v2->v3: > 1. Fix the compilation issue by removing the other usage of > VIRT_IRQCHIP_IPI_MSI > > --- > --- > hw/riscv/virt.c | 4 ---- > include/hw/riscv/virt.h | 1 - > 2 files changed, 5 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a5bc7353b412..6cf9355b99b6 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)); > @@ -597,8 +595,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 (imsic_guest_bits) { > qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,guest-index-bits", > imsic_guest_bits); > 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 > >
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index a5bc7353b412..6cf9355b99b6 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)); @@ -597,8 +595,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 (imsic_guest_bits) { qemu_fdt_setprop_cell(mc->fdt, imsic_name, "riscv,guest-index-bits", imsic_guest_bits); 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> --- Changes from v2->v3: 1. Fix the compilation issue by removing the other usage of VIRT_IRQCHIP_IPI_MSI --- --- hw/riscv/virt.c | 4 ---- include/hw/riscv/virt.h | 1 - 2 files changed, 5 deletions(-)