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

Commit 54668ad7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: Fix restore of policy min/max for hotplug"

parents 96dd83b6 98aa9f47

drivers/cpufreq/cpufreq.c

+12 −11
Original line number Diff line number Diff line
@@ -967,6 +967,18 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 
	struct cpufreq_policy new_policy;

	int ret = 0;



	/* Restore policy->min/max for hotplug */

	if (per_cpu(cpufreq_policy_save, policy->cpu).min) {

		policy->min = per_cpu(cpufreq_policy_save, policy->cpu).min;

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

	}

	if (per_cpu(cpufreq_policy_save, policy->cpu).max) {

		policy->max = per_cpu(cpufreq_policy_save, policy->cpu).max;

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

	}

	pr_debug("Restoring CPU%d user policy min %d and max %d\n",

		 policy->cpu, policy->min, policy->max);



	memcpy(&new_policy, policy, sizeof(*policy));



	/* Update governor of new_policy to the governor used before hotplug */
@@ -979,17 +991,6 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 


	new_policy.governor = gov;



	if (per_cpu(cpufreq_policy_save, policy->cpu).min) {

		policy->min = per_cpu(cpufreq_policy_save, policy->cpu).min;

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

	}

	if (per_cpu(cpufreq_policy_save, policy->cpu).max) {

		policy->max = per_cpu(cpufreq_policy_save, policy->cpu).max;

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

	}

	pr_debug("Restoring CPU%d user policy min %d and max %d\n",

		 policy->cpu, policy->min, policy->max);



	/* Use the default policy if its valid. */

	if (cpufreq_driver->setpolicy)

		cpufreq_parse_governor(gov->name, &new_policy.policy, NULL);