From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 May 2022 10:30:18 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v4.9.313~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35518d08a60eb2fdb2f3bcf4f0ce9fe1aeab6222;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	revert-parisc-mark-sched_clock-unstable-only-if-clocks-are-not-syncronized.patch
---

diff --git a/queue-5.15/revert-parisc-mark-sched_clock-unstable-only-if-clocks-are-not-syncronized.patch b/queue-5.15/revert-parisc-mark-sched_clock-unstable-only-if-clocks-are-not-syncronized.patch
new file mode 100644
index 00000000000..fba1851bd2c
--- /dev/null
+++ b/queue-5.15/revert-parisc-mark-sched_clock-unstable-only-if-clocks-are-not-syncronized.patch
@@ -0,0 +1,50 @@
+From 7962c0896429af2a0e00ec6bc15d992536453b2d Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Sat, 7 May 2022 15:32:38 +0200
+Subject: Revert "parisc: Mark sched_clock unstable only if clocks are not syncronized"
+
+From: Helge Deller <deller@gmx.de>
+
+commit 7962c0896429af2a0e00ec6bc15d992536453b2d upstream.
+
+This reverts commit d97180ad68bdb7ee10f327205a649bc2f558741d.
+
+It triggers RCU stalls at boot with a 32-bit kernel.
+
+Signed-off-by: Helge Deller <deller@gmx.de>
+Noticed-by: John David Anglin <dave.anglin@bell.net>
+Cc: stable@vger.kernel.org # v5.15+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/parisc/kernel/setup.c |    2 ++
+ arch/parisc/kernel/time.c  |    6 +-----
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+--- a/arch/parisc/kernel/setup.c
++++ b/arch/parisc/kernel/setup.c
+@@ -150,6 +150,8 @@ void __init setup_arch(char **cmdline_p)
+ #ifdef CONFIG_PA11
+ 	dma_ops_init();
+ #endif
++
++	clear_sched_clock_stable();
+ }
+ 
+ /*
+--- a/arch/parisc/kernel/time.c
++++ b/arch/parisc/kernel/time.c
+@@ -249,13 +249,9 @@ void __init time_init(void)
+ static int __init init_cr16_clocksource(void)
+ {
+ 	/*
+-	 * The cr16 interval timers are not syncronized across CPUs, even if
+-	 * they share the same socket.
++	 * The cr16 interval timers are not synchronized across CPUs.
+ 	 */
+ 	if (num_online_cpus() > 1 && !running_on_qemu) {
+-		/* mark sched_clock unstable */
+-		clear_sched_clock_stable();
+-
+ 		clocksource_cr16.name = "cr16_unstable";
+ 		clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
+ 		clocksource_cr16.rating = 0;
diff --git a/queue-5.15/series b/queue-5.15/series
index ee5cbb7430c..44ed2665c7c 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -101,3 +101,4 @@ kvm-lapic-enable-timer-posted-interrupt-only-when-mw.patch
 selftest-vm-verify-mmap-addr-in-mremap_test.patch
 selftest-vm-verify-remap-destination-address-in-mrem.patch
 mmc-rtsx-add-74-clocks-in-power-on-flow.patch
+revert-parisc-mark-sched_clock-unstable-only-if-clocks-are-not-syncronized.patch