Commit 743f0573 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:

 - prevent the intel_pstate driver from printing excessive diagnostic
   messages in some cases (Chris Wilson)

 - make the hibernation restore kernel freeze kernel threads as well as
   user space tasks (Dexuan Cui)

 - fix the ACPI device PM disagnostic messages to include the correct
   power state name (Kai-Heng Feng).

* tag 'pm-5.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: ACPI: Output correct message on target power state
  PM: hibernate: Freeze kernel threads in software_resume()
  cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once
parents f66ed1eb a5383996

drivers/acpi/device_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -273,13 +273,13 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
 end:

	if (result) {

		dev_warn(&device->dev, "Failed to change power state to %s\n",

			 acpi_power_state_string(state));

			 acpi_power_state_string(target_state));

	} else {

		device->power.state = target_state;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Device [%s] transitioned to %s\n",

				  device->pnp.bus_id,

				  acpi_power_state_string(state)));

				  acpi_power_state_string(target_state)));

	}



	return result;

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b, 


	update_turbo_state();

	if (global.turbo_disabled) {

		pr_warn("Turbo disabled by BIOS or unavailable on processor\n");

		pr_notice_once("Turbo disabled by BIOS or unavailable on processor\n");

		mutex_unlock(&intel_pstate_limits_lock);

		mutex_unlock(&intel_pstate_driver_lock);

		return -EPERM;

kernel/power/hibernate.c

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ static int software_resume(void) 
	error = freeze_processes();

	if (error)

		goto Close_Finish;



	error = freeze_kernel_threads();

	if (error) {

		thaw_processes();

		goto Close_Finish;

	}



	error = load_image_and_restore();

	thaw_processes();

 Finish:

CRA Git | Maintained and supported by SUSTech CRA and CCSE