From: Sasha Levin Date: Wed, 5 Apr 2023 11:31:55 +0000 (-0400) Subject: Fixes for 6.1 X-Git-Tag: v6.1.23~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9f2346db4a8485e9f4f46da43df232ac694c54e;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch b/queue-6.1/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch new file mode 100644 index 00000000000..38645e58126 --- /dev/null +++ b/queue-6.1/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch @@ -0,0 +1,37 @@ +From 0001b736a000410270001def4bc7014a2149c228 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Apr 2023 07:31:15 -0400 +Subject: Revert "cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again*" + +This reverts commit 07fc78d8f0c960f7ca241de98bc8c6bfe7d200f3 which was +upstream commit 6d9c7f51b1d9179bf7c3542267c656a934e8af23. + +Lockdep warnings on boot that are not seen with Linus's tree. + +Signed-off-by: Sasha Levin +--- + drivers/idle/intel_idle.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c +index f060ac7376e69..cfeb24d40d378 100644 +--- a/drivers/idle/intel_idle.c ++++ b/drivers/idle/intel_idle.c +@@ -168,7 +168,13 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev, + + raw_local_irq_enable(); + ret = __intel_idle(dev, drv, index); +- raw_local_irq_disable(); ++ ++ /* ++ * The lockdep hardirqs state may be changed to 'on' with timer ++ * tick interrupt followed by __do_softirq(). Use local_irq_disable() ++ * to keep the hardirqs state correct. ++ */ ++ local_irq_disable(); + + return ret; + } +-- +2.39.2 + diff --git a/queue-6.1/series b/queue-6.1/series index 3f0a1259cdf..bdaef22c6c9 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -175,3 +175,4 @@ usb-ucsi-fix-ucsi-connector-race.patch drm-amdkfd-get-prange-offset-after-svm_range_vram_node_new.patch hsr-ratelimit-only-when-errors-are-printed.patch x86-pvh-avoid-32-bit-build-warning-when-obtaining-vga-console-info.patch +revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch