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

Commit 906fe033 authored by Ed Swarthout's avatar Ed Swarthout Committed by Rafael J. Wysocki
Browse files

cpufreq: ppc-corenet-cpu-freq: do_div use quotient 



Commit 6712d293 (cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost
error) used the remainder from do_div instead of the quotient.  Fix that
and add one to ensure minimum is met.

Fixes: 6712d293 (cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error)
Signed-off-by: default avatarEd Swarthout <Ed.Swarthout@freescale.com>
Cc: 3.15+ <stable@vger.kernel.org> # 3.15+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 57aa5ea0

drivers/cpufreq/ppc-corenet-cpufreq.c

+5 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	struct cpufreq_frequency_table *table;

	struct cpu_data *data;

	unsigned int cpu = policy->cpu;

	u64 transition_latency_hz;

	u64 u64temp;



	np = of_get_cpu_node(cpu, NULL);

	if (!np)
@@ -206,9 +206,10 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	for_each_cpu(i, per_cpu(cpu_mask, cpu))

		per_cpu(cpu_data, i) = data;



	transition_latency_hz = 12ULL * NSEC_PER_SEC;

	policy->cpuinfo.transition_latency =

		do_div(transition_latency_hz, fsl_get_sys_freq());

	/* Minimum transition latency is 12 platform clocks */

	u64temp = 12ULL * NSEC_PER_SEC;

	do_div(u64temp, fsl_get_sys_freq());

	policy->cpuinfo.transition_latency = u64temp + 1;



	of_node_put(np);