6.1-stable patches

added patches:
	risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch

diff --git a/queue-6.1/risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch b/queue-6.1/risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch
new file mode 100644 (file)
index 0000000..623cb55
--- /dev/null
+++ b/queue-6.1/risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch
@@ -0,0 +1,43 @@
+From 52909f1768023656d5c429873e2246a134289a95 Mon Sep 17 00:00:00 2001
+From: Conor Dooley <conor.dooley@microchip.com>
+Date: Thu, 29 Jun 2023 12:33:34 +0100
+Subject: RISC-V: drop error print from riscv_hartid_to_cpuid()
+
+From: Conor Dooley <conor.dooley@microchip.com>
+
+commit 52909f1768023656d5c429873e2246a134289a95 upstream.
+
+As of commit 2ac874343749 ("RISC-V: split early & late of_node to
+hartid mapping") my CI complains about newly added pr_err() messages
+during boot, for example:
+[    0.000000] Couldn't find cpu id for hartid [0]
+[    0.000000] riscv-intc: unable to find hart id for /cpus/cpu@0/interrupt-controller
+
+Before the split, riscv_of_processor_hartid() contained a check for
+whether the cpu was "available", before calling riscv_hartid_to_cpuid(),
+but after the split riscv_of_processor_hartid() can be called for cpus
+that are disabled.
+
+Most callers of riscv_hartid_to_cpuid() already report custom errors
+where it falls, making this print superfluous in those case. In other
+places, the print adds nothing - see riscv_intc_init() for example.
+
+Fixes: 2ac874343749 ("RISC-V: split early & late of_node to hartid mapping")
+Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
+Link: https://lore.kernel.org/r/20230629-paternity-grafted-b901b76d04a0@wendy
+Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/kernel/smp.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/riscv/kernel/smp.c
++++ b/arch/riscv/kernel/smp.c
+@@ -58,7 +58,6 @@ int riscv_hartid_to_cpuid(unsigned long
+               if (cpuid_to_hartid_map(i) == hartid)
+                       return i;
+ 
+-      pr_err("Couldn't find cpu id for hartid [%lu]\n", hartid);
+       return -ENOENT;
+ }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 33d9f950dcafcecb4e4f4227bf7496a527321977..4e7717ab540f682b383ccdda2f4d39d899cb60a4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -365,3 +365,4 @@ tracing-have-trace_event_file-have-ref-counters.patch
 input-xpad-add-vid-for-turtle-beach-controllers.patch
 mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch
 cxl-port-fix-null-pointer-access-in-devm_cxl_add_port.patch
+risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch