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

Commit 2c2c1af4 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki
Browse files

cpufreq: intel_pstate: Fix code ordering in intel_pstate_set_policy() 



The limits->max_perf is rounded_up but immediately overwritten by
another assignment to limits->max_perf.

Move that operation to the correct location.

While here also added a pr_debug() call in ->set_policy to aid in
debugging.

Fixes: 785ee278 (cpufreq: intel_pstate: Fix limits->max_perf rounding error)
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ rjw : Subject & changelog ]
Cc: 4.4+ <stable@vger.kernel.org> # 4.4+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b9af6948

drivers/cpufreq/intel_pstate.c

+4 −1
Original line number Diff line number Diff line
@@ -1460,6 +1460,9 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 


	intel_pstate_clear_update_util_hook(policy->cpu);



	pr_debug("set_policy cpuinfo.max %u policy->max %u\n",

		 policy->cpuinfo.max_freq, policy->max);



	cpu = all_cpu_data[0];

	if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate &&

	    policy->max < policy->cpuinfo.max_freq &&
@@ -1495,13 +1498,13 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 
				   limits->max_sysfs_pct);

	limits->max_perf_pct = max(limits->min_policy_pct,

				   limits->max_perf_pct);

	limits->max_perf = round_up(limits->max_perf, FRAC_BITS);



	/* Make sure min_perf_pct <= max_perf_pct */

	limits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);



	limits->min_perf = div_fp(limits->min_perf_pct, 100);

	limits->max_perf = div_fp(limits->max_perf_pct, 100);

	limits->max_perf = round_up(limits->max_perf, FRAC_BITS);



 out:

	intel_pstate_set_update_util_hook(policy->cpu);