From 4a2e8a0d958d4ee8784fd024203f030a418599de Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Nov 2023 15:45:28 +0000 Subject: [PATCH] 6.1-stable patches added patches: risc-v-drop-error-print-from-riscv_hartid_to_cpuid.patch --- ...ror-print-from-riscv_hartid_to_cpuid.patch | 43 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-6.1/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 index 00000000000..623cb554a2e --- /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 +Date: Thu, 29 Jun 2023 12:33:34 +0100 +Subject: RISC-V: drop error print from riscv_hartid_to_cpuid() + +From: Conor Dooley + +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 +Link: https://lore.kernel.org/r/20230629-paternity-grafted-b901b76d04a0@wendy +Signed-off-by: Palmer Dabbelt +Signed-off-by: Greg Kroah-Hartman +--- + 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 33d9f950dca..4e7717ab540 100644 --- 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 -- 2.47.3