]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 May 2025 08:59:18 +0000 (10:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 May 2025 08:59:18 +0000 (10:59 +0200)
added patches:
clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch

queue-5.4/clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch b/queue-5.4/clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch
new file mode 100644 (file)
index 0000000..af0ac1b
--- /dev/null
@@ -0,0 +1,56 @@
+From 94cff94634e506a4a44684bee1875d2dbf782722 Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 4 Apr 2025 15:31:16 +0200
+Subject: clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable()
+
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+
+commit 94cff94634e506a4a44684bee1875d2dbf782722 upstream.
+
+On x86 during boot, clockevent_i8253_disable() can be invoked via
+x86_late_time_init -> hpet_time_init() -> pit_timer_init() which happens
+with enabled interrupts.
+
+If some of the old i8253 hardware is actually used then lockdep will notice
+that i8253_lock is used in hard interrupt context. This causes lockdep to
+complain because it observed the lock being acquired with interrupts
+enabled and in hard interrupt context.
+
+Make clockevent_i8253_disable() acquire the lock with
+raw_spinlock_irqsave() to cure this.
+
+[ tglx: Massage change log and use guard() ]
+
+Fixes: c8c4076723dac ("x86/timer: Skip PIT initialization on modern chipsets")
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/all/20250404133116.p-XRWJXf@linutronix.de
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clocksource/i8253.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/clocksource/i8253.c
++++ b/drivers/clocksource/i8253.c
+@@ -103,7 +103,9 @@ int __init clocksource_i8253_init(void)
+ #ifdef CONFIG_CLKEVT_I8253
+ void clockevent_i8253_disable(void)
+ {
+-      raw_spin_lock(&i8253_lock);
++      unsigned long flags;
++
++      raw_spin_lock_irqsave(&i8253_lock, flags);
+       /*
+        * Writing the MODE register should stop the counter, according to
+@@ -133,7 +135,7 @@ void clockevent_i8253_disable(void)
+       outb_p(0x30, PIT_MODE);
+-      raw_spin_unlock(&i8253_lock);
++      raw_spin_unlock_irqrestore(&i8253_lock, flags);
+ }
+ static int pit_shutdown(struct clock_event_device *evt)
index 9121330090cfba39e68c577e813df4a48152b5be..073e43c0f0aee4d627e70e06fb70f1a437beefa6 100644 (file)
@@ -79,3 +79,4 @@ acpi-pptt-fix-processor-subtable-walk.patch
 alsa-es1968-add-error-handling-for-snd_pcm_hw_constraint_pow2.patch
 phy-fix-error-handling-in-tegra_xusb_port_init.patch
 phy-renesas-rcar-gen3-usb2-set-timing-registers-only-once.patch
+clocksource-i8253-use-raw_spinlock_irqsave-in-clockevent_i8253_disable.patch