]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
m68k: mvme147: Fix SCSI controller IRQ numbers
authorDaniel Palmer <daniel@0x0f.com>
Thu, 3 Oct 2024 03:29:47 +0000 (13:29 +1000)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 6 Nov 2024 14:10:14 +0000 (15:10 +0100)
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.

Fixes: 200a3d352cd5 ("[PATCH] m68k: convert VME irq code")
Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Reviewed-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/0e7636a21a0274eea35bfd5d874459d5078e97cc.1727926187.git.fthain@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/mvme147hw.h

index e28eb1c0e0bfb37986e520102214fd6e5e1cd5b3..dbf88059e47a4dd44199b2636b8697f2da153608 100644 (file)
@@ -93,8 +93,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)
 
 /* SCC interrupts, for MVME147 */