Hi Nick! On 12/22/20 9:54 PM, Nick Desaulniers wrote: > request_irq is marked __must_check, but the call in shx3_prepare_cpus > has a void return type, so it can't propagate failure to the caller. > Follow cues from hexagon and just print an error. > > Fixes: c7936b9abcf5 ("sh: smp: Hook in to the generic IPI handler for SH-X3 > SMP.") > Cc: Miguel Ojeda <miguel.ojeda.sando...@gmail.com> > Cc: Paul Mundt <let...@linux-sh.org> > Reported-by: Guenter Roeck <li...@roeck-us.net> > Signed-off-by: Nick Desaulniers <ndesaulni...@google.com> > --- > arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c > b/arch/sh/kernel/cpu/sh4a/smp-shx3.c > index f8a2bec0f260..1261dc7b84e8 100644 > --- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c > +++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c > @@ -73,8 +73,9 @@ static void shx3_prepare_cpus(unsigned int max_cpus) > BUILD_BUG_ON(SMP_MSG_NR >= 8); > > for (i = 0; i < SMP_MSG_NR; i++) > - request_irq(104 + i, ipi_interrupt_handler, > - IRQF_PERCPU, "IPI", (void *)(long)i); > + if (request_irq(104 + i, ipi_interrupt_handler, > + IRQF_PERCPU, "IPI", (void *)(long)i)) > + pr_err("Failed to request irq %d\n", i); > > for (i = 0; i < max_cpus; i++) > set_cpu_present(i, true); >
Verified on my SH-7785LCR board. Boots fine. Tested-by: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913