5.16-stable patches

added patches:
	riscv-dts-k210-fix-broken-irqs-on-hart1.patch

diff --git a/queue-5.16/riscv-dts-k210-fix-broken-irqs-on-hart1.patch b/queue-5.16/riscv-dts-k210-fix-broken-irqs-on-hart1.patch
new file mode 100644 (file)
index 0000000..8f40889
--- /dev/null
+++ b/queue-5.16/riscv-dts-k210-fix-broken-irqs-on-hart1.patch
@@ -0,0 +1,49 @@
+From 74583f1b92cb3bbba1a3741cea237545c56f506c Mon Sep 17 00:00:00 2001
+From: Niklas Cassel <niklas.cassel@wdc.com>
+Date: Tue, 1 Mar 2022 00:44:18 +0000
+Subject: riscv: dts: k210: fix broken IRQs on hart1
+
+From: Niklas Cassel <niklas.cassel@wdc.com>
+
+commit 74583f1b92cb3bbba1a3741cea237545c56f506c upstream.
+
+Commit 67d96729a9e7 ("riscv: Update Canaan Kendryte K210 device tree")
+incorrectly removed two entries from the PLIC interrupt-controller node's
+interrupts-extended property.
+
+The PLIC driver cannot know the mapping between hart contexts and hart ids,
+so this information has to be provided by device tree, as specified by the
+PLIC device tree binding.
+
+The PLIC driver uses the interrupts-extended property, and initializes the
+hart context registers in the exact same order as provided by the
+interrupts-extended property.
+
+In other words, if we don't specify the S-mode interrupts, the PLIC driver
+will simply initialize the hart0 S-mode hart context with the hart1 M-mode
+configuration. It is therefore essential to specify the S-mode IRQs even
+though the system itself will only ever be running in M-mode.
+
+Re-add the S-mode interrupts, so that we get working IRQs on hart1 again.
+
+Cc: <stable@vger.kernel.org>
+Fixes: 67d96729a9e7 ("riscv: Update Canaan Kendryte K210 device tree")
+Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
+Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/boot/dts/canaan/k210.dtsi |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/riscv/boot/dts/canaan/k210.dtsi
++++ b/arch/riscv/boot/dts/canaan/k210.dtsi
+@@ -113,7 +113,8 @@
+                       compatible = "canaan,k210-plic", "sifive,plic-1.0.0";
+                       reg = <0xC000000 0x4000000>;
+                       interrupt-controller;
+-                      interrupts-extended = <&cpu0_intc 11 &cpu1_intc 11>;
++                      interrupts-extended = <&cpu0_intc 11>, <&cpu0_intc 9>,
++                                            <&cpu1_intc 11>, <&cpu1_intc 9>;
+                       riscv,ndev = <65>;
+               };
+ 

diff --git a/queue-5.16/series b/queue-5.16/series
index 6779dee1e14d3ac8494ba6700549e9884d6ad22e..31a94200ef373e93cdfb4aa58d94f787617a5347 100644 (file)
--- a/queue-5.16/series
+++ b/queue-5.16/series
@@ -118,3 +118,4 @@ x86-traps-mark-do_int3-nokprobe_symbol.patch
 drm-panel-select-drm_dp_helper-for-drm_panel_edp.patch
 perf-parse-fix-event-parser-error-for-hybrid-systems.patch
 btrfs-make-send-work-with-concurrent-block-group-relocation.patch
+riscv-dts-k210-fix-broken-irqs-on-hart1.patch