tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael WysockiL
"These fix up the ACPI processor driver after a change made during the
5.16 cycle that inadvertently broke falling back to shallower C-states
when C3 cannot be used.

Specifics:

- Make the ACPI processor driver avoid falling back to C3 type of
C-states when C3 cannot be requested (Ville Syrjälä)

- Revert a quirk that is not necessary any more after fixing the
underlying issue properly (Ville Syrjälä)"

* tag 'acpi-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI: processor: idle: fix lockup regression on 32-bit ThinkPad T40"
ACPI: processor: idle: Avoid falling back to C3 type C-states

Linus Torvalds f12d31c0 259b897e

+2 -6
+2 -6
drivers/acpi/processor_idle.c
··· 96 96 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 97 97 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 98 98 (void *)1}, 99 - /* T40 can not handle C3 idle state */ 100 - { set_max_cstate, "IBM ThinkPad T40", { 101 - DMI_MATCH(DMI_SYS_VENDOR, "IBM"), 102 - DMI_MATCH(DMI_PRODUCT_NAME, "23737CU")}, 103 - (void *)2}, 104 99 {}, 105 100 }; 106 101 ··· 790 795 if (cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 || 791 796 cx->type == ACPI_STATE_C3) { 792 797 state->enter_dead = acpi_idle_play_dead; 793 - drv->safe_state_index = count; 798 + if (cx->type != ACPI_STATE_C3) 799 + drv->safe_state_index = count; 794 800 } 795 801 /* 796 802 * Halt-induced C1 is not good for ->enter_s2idle, because it