cpufreq: interactive: restart above_hispeed_delay at each hispeed load

Change-Id: I2e5b91d45e8806b0ab94ca2301ed671c9af9ab13
Signed-off-by: Todd Poynor <toddpoynor@google.com>

diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 7cb2e641fcdc2daf38220b4ac460fdf45a93d9ff..a4ed750f9d27f77f66b3030d3cced8145282596b 100644 (file)
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -52,6 +52,7 @@ struct cpufreq_interactive_cpuinfo {
        unsigned int target_freq;
        unsigned int floor_freq;
        u64 floor_validate_time;
+       u64 hispeed_validate_time;
        int governor_enabled;
 };
 
@@ -206,7 +207,7 @@ static void cpufreq_interactive_timer(unsigned long data)
 
                        if (pcpu->target_freq == hispeed_freq &&
                            new_freq > hispeed_freq &&
-                           pcpu->timer_run_time - pcpu->target_set_time
+                           pcpu->timer_run_time - pcpu->hispeed_validate_time
                            < above_hispeed_delay_val) {
                                trace_cpufreq_interactive_notyet(data, cpu_load,
                                                                 pcpu->target_freq,
@@ -218,6 +219,9 @@ static void cpufreq_interactive_timer(unsigned long data)
                new_freq = pcpu->policy->max * cpu_load / 100;
        }
 
+       if (new_freq <= hispeed_freq)
+               pcpu->hispeed_validate_time = pcpu->timer_run_time;
+
        if (cpufreq_frequency_table_target(pcpu->policy, pcpu->freq_table,
                                           new_freq, CPUFREQ_RELATION_H,
                                           &index)) {
@@ -505,6 +509,7 @@ static void cpufreq_interactive_boost(void)
                        cpumask_set_cpu(i, &up_cpumask);
                        pcpu->target_set_time_in_idle =
                                get_cpu_idle_time_us(i, &pcpu->target_set_time);
+                       pcpu->hispeed_validate_time = pcpu->target_set_time;
                        anyboost = 1;
                }
 
@@ -838,6 +843,8 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
                        pcpu->floor_freq = pcpu->target_freq;
                        pcpu->floor_validate_time =
                                pcpu->target_set_time;
+                       pcpu->hispeed_validate_time =
+                               pcpu->target_set_time;
                        pcpu->governor_enabled = 1;
                        smp_wmb();
                }