Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e30444e authored by Lan Tianyu's avatar Lan Tianyu Committed by Rafael J. Wysocki
Browse files

cpufreq: fix cpufreq suspend/resume for intel_pstate 



Cpufreq core introduces cpufreq_suspended flag to let cpufreq sysfs nodes
across S2RAM/S2DISK. But the flag is only set in the cpufreq_suspend()
for cpufreq drivers which have target or target_index callback. This
skips intel_pstate driver. This patch is to set the flag before checking
target or target_index callback.

Fixes: 2f0aea93 (cpufreq: suspend governors on system suspend/hibernate)
Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
[rjw: Subject]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0f33be00

drivers/cpufreq/cpufreq.c

+4 −4
Original line number Diff line number Diff line
@@ -1656,6 +1656,8 @@ void cpufreq_suspend(void) 
	if (!cpufreq_driver)

		return;



	cpufreq_suspended = true;



	if (!has_target())

		return;
@@ -1670,8 +1672,6 @@ void cpufreq_suspend(void) 
			pr_err("%s: Failed to suspend driver: %p\n", __func__,

				policy);

	}



	cpufreq_suspended = true;

}



/**
@@ -1687,13 +1687,13 @@ void cpufreq_resume(void) 
	if (!cpufreq_driver)

		return;



	cpufreq_suspended = false;



	if (!has_target())

		return;



	pr_debug("%s: Resuming Governors\n", __func__);



	cpufreq_suspended = false;



	list_for_each_entry(policy, &cpufreq_policy_list, policy_list) {

		if (cpufreq_driver->resume && cpufreq_driver->resume(policy))

			pr_err("%s: Failed to resume driver: %p\n", __func__,