| Message ID | 20240522184953.28531-3-palmer@rivosinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 46cad6cd9b10ab14acf20e0779998f88c6e44c4f |
| Headers | show |
| Series | irqchip: riscv-imsic: Fixup riscv_ipi_set_virq_range() conflict | expand |
On Thu, May 23, 2024 at 12:26 AM Palmer Dabbelt <palmer@rivosinc.com> wrote: > > From: Palmer Dabbelt <palmer@rivosinc.com> > > There was a semantic conflict between 21a8f8a0eb35 ("irqchip: Add RISC-V > incoming MSI controller early driver") and dc892fb44322 ("riscv: Use > IPIs for remote cache/TLB flushes by default") due to an API change. > This manifests as a build failure post-merge. > > Reported-by: Tomasz Jeznach <tjeznach@rivosinc.com> > Link: https://lore.kernel.org/all/mhng-10b71228-cf3e-42ca-9abf-5464b15093f1@palmer-ri-x1c9/ > Fixes: 0bfbc914d943 ("Merge tag 'riscv-for-linus-6.10-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux") > Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > Sorry I wasn't clear about this one, but looks like it got dropped as > part of the merge. I'm happy to pick this up via the RISC-V tree if > folks want, but I'll keep it stashed off to the side for now as it's > just touching irqchip. I'm planning on sending some more stuff on > Friday morning, so just LMK. > --- > drivers/irqchip/irq-riscv-imsic-early.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c > index 886418ec06cb..4fbb37074d29 100644 > --- a/drivers/irqchip/irq-riscv-imsic-early.c > +++ b/drivers/irqchip/irq-riscv-imsic-early.c > @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void) > return virq < 0 ? virq : -ENOMEM; > > /* Set vIRQ range */ > - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true); > + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI); > > /* Announce that IMSIC is providing IPIs */ > pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID); > -- > 2.45.0 >
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Wed, 22 May 2024 11:49:55 -0700 you wrote: > From: Palmer Dabbelt <palmer@rivosinc.com> > > There was a semantic conflict between 21a8f8a0eb35 ("irqchip: Add RISC-V > incoming MSI controller early driver") and dc892fb44322 ("riscv: Use > IPIs for remote cache/TLB flushes by default") due to an API change. > This manifests as a build failure post-merge. > > [...] Here is the summary with links: - irqchip: riscv-imsic: Fixup riscv_ipi_set_virq_range() conflict https://git.kernel.org/riscv/c/46cad6cd9b10 You are awesome, thank you!
diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c index 886418ec06cb..4fbb37074d29 100644 --- a/drivers/irqchip/irq-riscv-imsic-early.c +++ b/drivers/irqchip/irq-riscv-imsic-early.c @@ -49,7 +49,7 @@ static int __init imsic_ipi_domain_init(void) return virq < 0 ? virq : -ENOMEM; /* Set vIRQ range */ - riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true); + riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI); /* Announce that IMSIC is providing IPIs */ pr_info("%pfwP: providing IPIs using interrupt %d\n", imsic->fwnode, IMSIC_IPI_ID);