Skip to content

Commit

Permalink
cpufreq: skip invalid entries when searching the frequency
Browse files Browse the repository at this point in the history 
Skip invalid entries when searching the frequency. This fixes cpufreq
at least on loongson2 MIPS board.

Fixes: da0c6dc (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>
  • Loading branch information
Aaro Koskinen authored and Rafael J. Wysocki committed Oct 12, 2016
1 parent 3954517 commit 899bb66
Showing 1 changed file with 52 additions and 52 deletions.
104 changes: 52 additions & 52 deletions include/linux/cpufreq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,48 +639,48 @@ static inline int cpufreq_table_find_index_al(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

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 */
static inline int cpufreq_table_find_index_dl(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

if (freq == target_freq)
return i;
return pos - table;

if (freq > target_freq) {
best = i;
best = pos;
continue;
}

/* No freq found above target_freq */
if (best == -1)
return i;
if (best == table - 1)
return pos - table;

return best;
return best - pos;
}

return best;
return best - pos;
}

/* Works only on sorted freq-tables */
Expand All @@ -700,48 +700,48 @@ static inline int cpufreq_table_find_index_ah(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

if (freq == target_freq)
return i;
return pos - table;

if (freq < target_freq) {
best = i;
best = pos;
continue;
}

/* No freq found below target_freq */
if (best == -1)
return i;
if (best == table - 1)
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 */
static inline int cpufreq_table_find_index_dh(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

if (freq <= target_freq)
return i;
return pos - table;

best = i;
best = pos;
}

return best;
return best - table;
}

/* Works only on sorted freq-tables */
Expand All @@ -761,65 +761,65 @@ static inline int cpufreq_table_find_index_ac(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

if (freq == target_freq)
return i;
return pos - table;

if (freq < target_freq) {
best = i;
best = pos;
continue;
}

/* No freq found below target_freq */
if (best == -1)
return i;
if (best == table - 1)
return pos - table;

/* Choose the closest freq */
if (target_freq - table[best].frequency > freq - target_freq)
return i;
if (target_freq - best->frequency > freq - target_freq)
return pos - table;

return best;
return best - table;
}

return best;
return best - table;
}

/* Find closest freq to target in a table in descending order */
static inline int cpufreq_table_find_index_dc(struct cpufreq_policy *policy,
unsigned int target_freq)
{
struct cpufreq_frequency_table *table = policy->freq_table;
struct cpufreq_frequency_table *pos, *best = table - 1;
unsigned int freq;
int i, best = -1;

for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
freq = table[i].frequency;
cpufreq_for_each_valid_entry(pos, table) {
freq = pos->frequency;

if (freq == target_freq)
return i;
return pos - table;

if (freq > target_freq) {
best = i;
best = pos;
continue;
}

/* No freq found above target_freq */
if (best == -1)
return i;
if (best == table - 1)
return pos - table;

/* Choose the closest freq */
if (table[best].frequency - target_freq > target_freq - freq)
return i;
if (best->frequency - target_freq > target_freq - freq)
return pos - table;

return best;
return best - table;
}

return best;
return best - table;
}

/* Works only on sorted freq-tables */
Expand Down

0 comments on commit 899bb66

Please sign in to comment.