Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git

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

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index e49512718325b73d59fa52d5eaf225560cce91e0..7264820e6443a65fdbd2587a5ee555a134f81cc5 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -29,6 +29,7 @@
 #include <linux/suspend.h>
 #include <linux/syscore_ops.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 #include <trace/events/power.h>
 
 static LIST_HEAD(cpufreq_policy_list);
@@ -154,6 +155,12 @@ bool have_governor_per_policy(void)
 }
 EXPORT_SYMBOL_GPL(have_governor_per_policy);
 
+bool cpufreq_driver_is_slow(void)
+{
+       return !(cpufreq_driver->flags & CPUFREQ_DRIVER_FAST);
+}
+EXPORT_SYMBOL_GPL(cpufreq_driver_is_slow);
+
 struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
 {
        if (have_governor_per_policy())
@@ -347,6 +354,50 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
 #endif
 }
 
+/*********************************************************************
+ *               FREQUENCY INVARIANT CPU CAPACITY                    *
+ *********************************************************************/
+
+static DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;
+static DEFINE_PER_CPU(unsigned long, max_freq_scale) = SCHED_CAPACITY_SCALE;
+
+static void
+scale_freq_capacity(struct cpufreq_policy *policy, struct cpufreq_freqs *freqs)
+{
+       unsigned long cur = freqs ? freqs->new : policy->cur;
+       unsigned long scale = (cur << SCHED_CAPACITY_SHIFT) / policy->max;
+       struct cpufreq_cpuinfo *cpuinfo = &policy->cpuinfo;
+       int cpu;
+
+       pr_debug("cpus %*pbl cur/cur max freq %lu/%u kHz freq scale %lu\n",
+                cpumask_pr_args(policy->cpus), cur, policy->max, scale);
+
+       for_each_cpu(cpu, policy->cpus)
+               per_cpu(freq_scale, cpu) = scale;
+
+       if (freqs)
+               return;
+
+       scale = (policy->max << SCHED_CAPACITY_SHIFT) / cpuinfo->max_freq;
+
+       pr_debug("cpus %*pbl cur max/max freq %u/%u kHz max freq scale %lu\n",
+                cpumask_pr_args(policy->cpus), policy->max, cpuinfo->max_freq,
+                scale);
+
+       for_each_cpu(cpu, policy->cpus)
+               per_cpu(max_freq_scale, cpu) = scale;
+}
+
+unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu)
+{
+       return per_cpu(freq_scale, cpu);
+}
+
+unsigned long cpufreq_scale_max_freq_capacity(int cpu)
+{
+       return per_cpu(max_freq_scale, cpu);
+}
+
 static void __cpufreq_notify_transition(struct cpufreq_policy *policy,
                struct cpufreq_freqs *freqs, unsigned int state)
 {
@@ -423,6 +474,7 @@ static void cpufreq_notify_post_transition(struct cpufreq_policy *policy,
 void cpufreq_freq_transition_begin(struct cpufreq_policy *policy,
                struct cpufreq_freqs *freqs)
 {
+       int cpu;
 
        /*
         * Catch double invocations of _begin() which lead to self-deadlock.
@@ -450,6 +502,10 @@ wait:
 
        spin_unlock(&policy->transition_lock);
 
+       scale_freq_capacity(policy, freqs);
+       for_each_cpu(cpu, policy->cpus)
+               trace_cpu_capacity(capacity_curr_of(cpu), cpu);
+
        cpufreq_notify_transition(policy, freqs, CPUFREQ_PRECHANGE);
 }
 EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin);
@@ -2126,6 +2182,8 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,
        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
                        CPUFREQ_NOTIFY, new_policy);
 
+       scale_freq_capacity(new_policy, NULL);
+
        policy->min = new_policy->min;
        policy->max = new_policy->max;
        trace_cpu_frequency_limits(policy->max, policy->min, policy->cpu);