android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpufreq: skip invalid entries when searching the frequency

Browse Source 
Skip invalid entries when searching the frequency. This fixes cpufreq
at least on loongson2 MIPS board.

Fixes: da0c6dc00c (cpufreq: Handle sorted frequency tables more efficiently)
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: 4.8+ <stable@vger.kernel.org> # 4.8+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Aaro Koskinen 2016-10-12 08:45:05 +05:30 committed by Rafael J. Wysocki
parent 3954517e2f
commit 899bb6642f
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
include/linux/cpufreq.h
View File

@ -639,19 +639,19 @@ static inline int cpufreq_table_find_index_al(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq >= target_freq) if (freq >= target_freq)
return i; return pos - table;
best = i; best = pos;
} }
return best; return best - table;
} }
/* Find lowest freq at or above target in a table in descending order */ /* Find lowest freq at or above target in a table in descending order */
@ -659,28 +659,28 @@ static inline int cpufreq_table_find_index_dl(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq == target_freq) if (freq == target_freq)
return i; return pos - table;
if (freq > target_freq) { if (freq > target_freq) {
best = i; best = pos;
continue; continue;
} }
/* No freq found above target_freq */ /* No freq found above target_freq */
if (best == -1) if (best == table - 1)
return i; return pos - table;
return best; return best - pos;
} }
return best; return best - pos;
} }
/* Works only on sorted freq-tables */ /* Works only on sorted freq-tables */
@ -700,28 +700,28 @@ static inline int cpufreq_table_find_index_ah(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq == target_freq) if (freq == target_freq)
return i; return pos - table;
if (freq < target_freq) { if (freq < target_freq) {
best = i; best = pos;
continue; continue;
} }
/* No freq found below target_freq */ /* No freq found below target_freq */
if (best == -1) if (best == table - 1)
return i; return pos - table;
return best; return best - table;
} }
return best; return best - table;
} }
/* Find highest freq at or below target in a table in descending order */ /* Find highest freq at or below target in a table in descending order */
@ -729,19 +729,19 @@ static inline int cpufreq_table_find_index_dh(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq <= target_freq) if (freq <= target_freq)
return i; return pos - table;
best = i; best = pos;
} }
return best; return best - table;
} }
/* Works only on sorted freq-tables */ /* Works only on sorted freq-tables */
@ -761,32 +761,32 @@ static inline int cpufreq_table_find_index_ac(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq == target_freq) if (freq == target_freq)
return i; return pos - table;
if (freq < target_freq) { if (freq < target_freq) {
best = i; best = pos;
continue; continue;
} }
/* No freq found below target_freq */ /* No freq found below target_freq */
if (best == -1) if (best == table - 1)
return i; return pos - table;
/* Choose the closest freq */ /* Choose the closest freq */
if (target_freq - table[best].frequency > freq - target_freq) if (target_freq - best->frequency > freq - target_freq)
return i; return pos - table;
return best; return best - table;
} }
return best; return best - table;
} }
/* Find closest freq to target in a table in descending order */ /* Find closest freq to target in a table in descending order */
@ -794,32 +794,32 @@ static inline int cpufreq_table_find_index_dc(struct cpufreq_policy *policy,
unsigned int target_freq) unsigned int target_freq)
{ {
struct cpufreq_frequency_table *table = policy->freq_table; struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq; unsigned int freq;
int i, best = -1;
for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { cpufreq_for_each_valid_entry(pos, table) {
freq = table[i].frequency; freq = pos->frequency;
if (freq == target_freq) if (freq == target_freq)
return i; return pos - table;
if (freq > target_freq) { if (freq > target_freq) {
best = i; best = pos;
continue; continue;
} }
/* No freq found above target_freq */ /* No freq found above target_freq */
if (best == -1) if (best == table - 1)
return i; return pos - table;
/* Choose the closest freq */ /* Choose the closest freq */
if (table[best].frequency - target_freq > target_freq - freq) if (best->frequency - target_freq > target_freq - freq)
return i; return pos - table;
return best; return best - table;
} }
return best; return best - table;
} }
/* Works only on sorted freq-tables */ /* Works only on sorted freq-tables */