sh: mach-highlander: Handle virq offset in cascaded IRL demux

geertu · gregkh · commit 5628b9aa3179 · 2023-07-19T16:22:18.000+02:00
commit a2601b8 upstream. Take into account the virq offset when translating cascaded IRL interrupts. Fixes: a8ac296 ("sh: Avoid using IRQ0 on SH3 and SH4") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/4fcb0d08a2b372431c41e04312742dc9e41e1be4.1688908186.git.geert+renesas@glider.be Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
@@ -389,10 +389,10 @@ static unsigned char irl2irq[HL_NR_IRL];
 
 static int highlander_irq_demux(int irq)
 {
-	if (irq >= HL_NR_IRL || irq < 0 || !irl2irq[irq])
+	if (irq >= HL_NR_IRL + 16 || irq < 16 || !irl2irq[irq - 16])
 		return irq;
 
-	return irl2irq[irq];
+	return irl2irq[irq - 16];
 }
 
 static void __init highlander_init_irq(void)

Original file line number	Diff line number	Diff line change
`@@ -389,10 +389,10 @@ static unsigned char irl2irq[HL_NR_IRL];`
`389`	`389`
`390`	`390`	`static int highlander_irq_demux(int irq)`
`391`	`391`	`{`
`392`		`- if (irq >= HL_NR_IRL \|\| irq < 0 \|\| !irl2irq[irq])`
	`392`	`+ if (irq >= HL_NR_IRL + 16 \|\| irq < 16 \|\| !irl2irq[irq - 16])`
`393`	`393`	`return irq;`
`394`	`394`
`395`		`- return irl2irq[irq];`
	`395`	`+ return irl2irq[irq - 16];`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`static void __init highlander_init_irq(void)`