This is a note to let you know that I've just added the patch titled
sh: mach-highlander: Handle virq offset in cascaded IRL demux
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sh-mach-highlander-handle-virq-offset-in-cascaded-irl-demux.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a2601b8d8f077368c6d113b4d496559415c6d495 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Date: Sun, 9 Jul 2023 15:10:23 +0200
Subject: sh: mach-highlander: Handle virq offset in cascaded IRL demux
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
commit a2601b8d8f077368c6d113b4d496559415c6d495 upstream.
Take into account the virq offset when translating cascaded IRL
interrupts.
Fixes: a8ac2961148e8c72 ("sh: Avoid using IRQ0 on SH3 and SH4")
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/4fcb0d08a2b372431c41e04312742dc9e41e1be4.1688908186.git.geert+renesas@xxxxxxxxx
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/sh/boards/mach-highlander/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- 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)
Patches currently in stable-queue which might be from geert+renesas@xxxxxxxxx are
queue-6.4/clk-rs9-fix-.driver_data-content-in-i2c_device_id.patch
queue-6.4/input-tests-fix-use-after-free-and-refcount-underflo.patch
queue-6.4/sh-dma-fix-dma-channel-offset-calculation.patch
queue-6.4/clk-vc7-fix-.driver_data-content-in-i2c_device_id.patch
queue-6.4/input-tests-modular-kunit-tests-should-not-depend-on.patch
queue-6.4/hid-uclogic-modular-kunit-tests-should-not-depend-on.patch
queue-6.4/clk-vc5-fix-.driver_data-content-in-i2c_device_id.patch
queue-6.4/sh-mach-dreamcast-handle-virq-offset-in-cascaded-irq-demux.patch
queue-6.4/regulator-core-fix-more-error-checking-for-debugfs_c.patch
queue-6.4/input-tests-fix-input_test_match_device_id-test.patch
queue-6.4/lib-dhry-fix-sleeping-allocations-inside-non-preempt.patch
queue-6.4/regulator-core-streamline-debugfs-operations.patch
queue-6.4/clk-renesas-rzg2l-fix-cpg_sipll5_clk1-register-write.patch
queue-6.4/sh-mach-r2d-handle-virq-offset-in-cascaded-irl-demux.patch
queue-6.4/sh-mach-highlander-handle-virq-offset-in-cascaded-irl-demux.patch
queue-6.4/arm-dts-iwg20d-q7-common-fix-backlight-pwm-specifier.patch
queue-6.4/sh-j2-use-ioremap-to-translate-device-tree-address-i.patch
queue-6.4/arm64-dts-renesas-ulcb-kf-remove-flow-control-for-sc.patch
queue-6.4/sh-hd64461-handle-virq-offset-for-offchip-irq-base-and-hd64461-irq.patch
queue-6.4/sh-avoid-using-irq0-on-sh3-and-sh4.patch
queue-6.4/media-renesas-fdp1-identify-r-car-gen2-versions.patch
