From 3d8f41471c0919c0050d7507bd8c3de1fd665754 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 5 Apr 2023 07:31:54 -0400 Subject: [PATCH] Fixes for 6.2 Signed-off-by: Sasha Levin --- ...ntel_idle-fix-cpuidle_flag_irq_enabl.patch | 37 +++++++++++++++++++ queue-6.2/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-6.2/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch diff --git a/queue-6.2/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch b/queue-6.2/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch new file mode 100644 index 00000000000..06427562209 --- /dev/null +++ b/queue-6.2/revert-cpuidle-intel_idle-fix-cpuidle_flag_irq_enabl.patch @@ -0,0 +1,37 @@ +From 5deae25ef0ca61def7af0085bfc9fa5d846296e6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Apr 2023 07:30:26 -0400 +Subject: Revert "cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again*" + +This reverts commit dca64f4bea7669f2056662e1f2776054d62f0153 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.2/series b/queue-6.2/series index 2e9a2342541..5eb153c0636 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -183,3 +183,4 @@ libbpf-fix-btf_dump-s-packed-struct-determination.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 -- 2.47.2