cpufreq: interactive: changed to be consistent with upstream
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 7405909..d7cbf37 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -46,6 +46,7 @@
int idling;
u64 target_set_time;
u64 target_set_time_in_idle;
+ u64 target_validate_time;
struct cpufreq_policy *policy;
struct cpufreq_frequency_table *freq_table;
unsigned int target_freq;
@@ -215,8 +216,6 @@
if (cpufreq_frequency_table_target(pcpu->policy, pcpu->freq_table,
new_freq, CPUFREQ_RELATION_H,
&index)) {
- pr_warn_once("timer %d: cpufreq_frequency_table_target error\n",
- (int) data);
goto rearm;
}
@@ -224,10 +223,11 @@
/*
* Do not scale down unless we have been at this frequency for the
- * minimum sample time.
+ * minimum sample time since last validated.
*/
if (new_freq < pcpu->target_freq) {
- if (cputime64_sub(pcpu->timer_run_time, pcpu->target_set_time)
+ if (cputime64_sub(pcpu->timer_run_time,
+ pcpu->target_validate_time)
< min_sample_time) {
trace_cpufreq_interactive_notyet(data, cpu_load,
pcpu->target_freq, new_freq);
@@ -235,8 +235,7 @@
}
}
- pcpu->target_set_time_in_idle = now_idle;
- pcpu->target_set_time = pcpu->timer_run_time;
+ pcpu->target_validate_time = pcpu->timer_run_time;
if (pcpu->target_freq == new_freq) {
trace_cpufreq_interactive_already(data, cpu_load,
@@ -246,6 +245,8 @@
trace_cpufreq_interactive_target(data, cpu_load, pcpu->target_freq,
new_freq);
+ pcpu->target_set_time_in_idle = now_idle;
+ pcpu->target_set_time = pcpu->timer_run_time;
if (new_freq < pcpu->target_freq) {
pcpu->target_freq = new_freq;
@@ -301,8 +302,9 @@
&per_cpu(cpuinfo, smp_processor_id());
int pending;
- if (!pcpu->governor_enabled)
+ if (!pcpu->governor_enabled) {
return;
+ }
pcpu->idling = 1;
smp_wmb();
@@ -401,7 +403,6 @@
}
set_current_state(TASK_RUNNING);
-
tmp_mask = up_cpumask;
cpumask_clear(&up_cpumask);
spin_unlock_irqrestore(&up_cpumask_lock, flags);
@@ -411,7 +412,6 @@
unsigned int max_freq = 0;
pcpu = &per_cpu(cpuinfo, cpu);
-
smp_rmb();
if (!pcpu->governor_enabled)
@@ -509,8 +509,7 @@
* allowing speed to drop).
*/
- pcpu->target_validate_time_in_idle =
- get_cpu_idle_time_us(i, &pcpu->target_validate_time);
+ pcpu->target_validate_time = ktime_to_us(ktime_get());
}
spin_unlock_irqrestore(&up_cpumask_lock, flags);
@@ -773,6 +772,8 @@
pcpu->target_set_time_in_idle =
get_cpu_idle_time_us(j,
&pcpu->target_set_time);
+ pcpu->target_validate_time =
+ pcpu->target_set_time;
pcpu->governor_enabled = 1;
smp_wmb();
}