Re: [PATCH] m68k: mvme147: Fix SCSI controller IRQ numbers

[Geert Uytterhoeven]

On Thu, Oct 3, 2024 at 5:32 AM Finn Thain <fthain@xxxxxxxxxxxxxx> wrote:
> From: Daniel Palmer <daniel@xxxxxxxx>
>
> Sometime long ago the m68k IRQ code was refactored and the interrupt
> numbers for SCSI controller on this board ended up wrong, and it hasn't
> worked since.
>
> The PCC adds 0x40 to the vector for its interrupts so they end up in
> the user interrupt range. Hence, the kernel number should be the kernel
> offset for user interrupt range + the PCC interrupt number.
>
> Cc: Daniel Palmer <daniel@xxxxxxxx>
> Cc: stable@xxxxxxxxxx
> Fixes: 200a3d352cd5 ("[PATCH] m68k: convert VME irq code")
> Signed-off-by: Daniel Palmer <daniel@xxxxxxxx>
> Reviewed-by: Finn Thain <fthain@xxxxxxxxxxxxxx>

Reviewed-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
i.e. will queue in the m68k tree for v6.13.

> --- a/arch/m68k/include/asm/mvme147hw.h
> +++ b/arch/m68k/include/asm/mvme147hw.h
> @@ -76,8 +76,8 @@ struct pcc_regs {
>  #define M147_SCC_B_ADDR                0xfffe3000
>  #define M147_SCC_PCLK          5000000
>
> -#define MVME147_IRQ_SCSI_PORT  (IRQ_USER+0x45)
> -#define MVME147_IRQ_SCSI_DMA   (IRQ_USER+0x46)
> +#define MVME147_IRQ_SCSI_PORT  (IRQ_USER + 5)
> +#define MVME147_IRQ_SCSI_DMA   (IRQ_USER + 6)

Indeed, in all other locations where IRQ_USER was added, 0x40 was
subtracted, but these two were missed during the conversion.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds