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

Commit 08fd8c1c authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: preserve user_policy across suspend/resume 



Prevent __cpufreq_add_dev() from overwriting the existing values of
user_policy.{min|max|policy|governor} with defaults during resume
from system suspend.

Fixes: 5302c3fb ("cpufreq: Perform light-weight init/teardown during suspend/resume")
Reported-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
[rjw: Changelog]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 72368d12

drivers/cpufreq/cpufreq.c

+9 −5
Original line number Diff line number Diff line
@@ -839,9 +839,6 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 


	/* set default policy */

	ret = cpufreq_set_policy(policy, &new_policy);

	policy->user_policy.policy = policy->policy;

	policy->user_policy.governor = policy->governor;



	if (ret) {

		pr_debug("setting policy failed\n");

		if (cpufreq_driver->exit)
@@ -1071,8 +1068,10 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, 
	 */

	cpumask_and(policy->cpus, policy->cpus, cpu_online_mask);



	if (!frozen) {

		policy->user_policy.min = policy->min;

		policy->user_policy.max = policy->max;

	}



	blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

				     CPUFREQ_START, policy);
@@ -1103,6 +1102,11 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif, 


	cpufreq_init_policy(policy);



	if (!frozen) {

		policy->user_policy.policy = policy->policy;

		policy->user_policy.governor = policy->governor;

	}



	kobject_uevent(&policy->kobj, KOBJ_ADD);

	up_read(&cpufreq_rwsem);