Commit f12d31c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 259b897e 20e582e1

drivers/acpi/processor_idle.c

+2 −6
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ static const struct dmi_system_id processor_power_dmi_table[] = { 
	  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},

	{},

};
@@ -795,6 +790,7 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr) 
		if (cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ||

		    cx->type == ACPI_STATE_C3) {

			state->enter_dead = acpi_idle_play_dead;

			if (cx->type != ACPI_STATE_C3)

				drv->safe_state_index = count;

		}

		/*