From: Greg Kroah-Hartman Date: Thu, 14 Apr 2022 13:12:36 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.19.238~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db8b945942926b794db233336f74c6b1dbae2031;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: acpi-processor-idle-fix-lockup-regression-on-32-bit-thinkpad-t40.patch --- diff --git a/queue-5.15/acpi-processor-idle-fix-lockup-regression-on-32-bit-thinkpad-t40.patch b/queue-5.15/acpi-processor-idle-fix-lockup-regression-on-32-bit-thinkpad-t40.patch new file mode 100644 index 00000000000..dc689f8cc64 --- /dev/null +++ b/queue-5.15/acpi-processor-idle-fix-lockup-regression-on-32-bit-thinkpad-t40.patch @@ -0,0 +1,61 @@ +From bfe55a1f7fd6bfede16078bf04c6250fbca11588 Mon Sep 17 00:00:00 2001 +From: Woody Suwalski +Date: Wed, 9 Feb 2022 16:05:09 -0500 +Subject: ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Woody Suwalski + +commit bfe55a1f7fd6bfede16078bf04c6250fbca11588 upstream. + +Add and ACPI idle power level limit for 32-bit ThinkPad T40. + +There is a regression on T40 introduced by commit d6b88ce2, starting +with kernel 5.16: + +commit d6b88ce2eb9d2698eb24451eb92c0a1649b17bb1 +Author: Richard Gong +Date:   Wed Sep 22 08:31:16 2021 -0500 + + ACPI: processor idle: Allow playing dead in C3 state + +The above patch is trying to enter C3 state during init, what is causing +a T40 system freeze. I have not found a similar issue on any other of my +32-bit machines. + +The fix is to add another exception to the processor_power_dmi_table[] list. +As a result the dmesg shows as expected: + +[2.155398] ACPI: IBM ThinkPad T40 detected - limiting to C2 max_cstate. Override with "processor.max_cstate=9" +[2.155404] ACPI: processor limited to max C-state 2 + +The fix is trivial and affects only vintage T40 systems. + +Fixes: d6b88ce2eb9d ("CPI: processor idle: Allow playing dead in C3 state") +Signed-off-by: Woody Suwalski +Reviewed-by: Hans de Goede +Cc: 5.16+ # 5.16+ +[ rjw: New subject ] +Signed-off-by: Rafael J. Wysocki +Cc: "Limonciello, Mario" +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/processor_idle.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/acpi/processor_idle.c ++++ b/drivers/acpi/processor_idle.c +@@ -95,6 +95,11 @@ static const struct dmi_system_id proces + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, + (void *)1}, ++ /* T40 can not handle C3 idle state */ ++ { set_max_cstate, "IBM ThinkPad T40", { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23737CU")}, ++ (void *)2}, + {}, + }; + diff --git a/queue-5.15/series b/queue-5.15/series index d7d3a2e8efd..4cce16ed5d3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -5,3 +5,4 @@ hamradio-remove-needs_free_netdev-to-avoid-uaf.patch cpuidle-psci-move-the-has_lpi-check-to-the-beginning-of-the-function.patch acpi-processor-idle-check-for-architectural-support-for-lpi.patch acpi-processor-idle-allow-playing-dead-in-c3-state.patch +acpi-processor-idle-fix-lockup-regression-on-32-bit-thinkpad-t40.patch