Skip to content

Commit 743f057

Browse files
committed
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
2 parents f66ed1e + a538399 commit 743f057

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

drivers/acpi/device_pm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,13 @@ int acpi_device_set_power(struct acpi_device *device, int state)
273273
end:
274274
if (result) {
275275
dev_warn(&device->dev, "Failed to change power state to %s\n",
276-
acpi_power_state_string(state));
276+
acpi_power_state_string(target_state));
277277
} else {
278278
device->power.state = target_state;
279279
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
280280
"Device [%s] transitioned to %s\n",
281281
device->pnp.bus_id,
282-
acpi_power_state_string(state)));
282+
acpi_power_state_string(target_state)));
283283
}
284284

285285
return result;

drivers/cpufreq/intel_pstate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b,
10591059

10601060
update_turbo_state();
10611061
if (global.turbo_disabled) {
1062-
pr_warn("Turbo disabled by BIOS or unavailable on processor\n");
1062+
pr_notice_once("Turbo disabled by BIOS or unavailable on processor\n");
10631063
mutex_unlock(&intel_pstate_limits_lock);
10641064
mutex_unlock(&intel_pstate_driver_lock);
10651065
return -EPERM;

kernel/power/hibernate.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,13 @@ static int software_resume(void)
898898
error = freeze_processes();
899899
if (error)
900900
goto Close_Finish;
901+
902+
error = freeze_kernel_threads();
903+
if (error) {
904+
thaw_processes();
905+
goto Close_Finish;
906+
}
907+
901908
error = load_image_and_restore();
902909
thaw_processes();
903910
Finish:

0 commit comments

Comments
 (0)