Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / ppc-corenet-cpufreq.c

diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c b/drivers/cpufreq/ppc-corenet-cpufreq.c
index 0af618abebafa4b44b323d1811c1f885a52e0beb..bee5df7794d33d1078116c8ac2f3618075230c8c 100644 (file)
--- a/drivers/cpufreq/ppc-corenet-cpufreq.c
+++ b/drivers/cpufreq/ppc-corenet-cpufreq.c
@@ -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)
@@ -199,16 +199,16 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy)
        }
 
        data->table = table;
-       per_cpu(cpu_data, cpu) = data;
 
        /* update ->cpus if we have cluster, no harm if not */
        cpumask_copy(policy->cpus, per_cpu(cpu_mask, cpu));
        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);