Skip to content

Commit

Permalink
cpufreq: vexpress-spc: find and skip duplicates when merging frequencies
Browse files Browse the repository at this point in the history
Currently the cpufreq core aborts the validation and return error
immediately when it encounter duplicate frequency table entries.
This change was introduced long back since commit da0c6dc
("cpufreq: Handle sorted frequency tables more efficiently").

However, this missed the testing with modified firmware for long time.
Inorder to make it work with default settings, we need to ensure the
merged table for bL switcher contains no duplicates. Find the duplicates
and skip them when merging the frequenct tables of A15 and A7 clusters.

Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
Sudeep Holla authored and Viresh Kumar committed Oct 24, 2019
1 parent 4a6e135 commit e32beb0
Showing 1 changed file with 19 additions and 3 deletions.
22 changes: 19 additions & 3 deletions drivers/cpufreq/vexpress-spc-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,19 @@ static inline u32 get_table_max(struct cpufreq_frequency_table *table)
return max_freq;
}

static bool search_frequency(struct cpufreq_frequency_table *table, int size,
unsigned int freq)
{
int count;

for (count = 0; count < size; count++) {
if (table[count].frequency == freq)
return true;
}

return false;
}

static int merge_cluster_tables(void)
{
int i, j, k = 0, count = 1;
Expand All @@ -257,10 +270,13 @@ static int merge_cluster_tables(void)
freq_table[MAX_CLUSTERS] = table;

/* Add in reverse order to get freqs in increasing order */
for (i = MAX_CLUSTERS - 1; i >= 0; i--) {
for (i = MAX_CLUSTERS - 1; i >= 0; i--, count = k) {
for (j = 0; freq_table[i][j].frequency != CPUFREQ_TABLE_END;
j++, k++) {
table[k].frequency =
j++) {
if (i == A15_CLUSTER &&
search_frequency(table, count, freq_table[i][j].frequency))
continue; /* skip duplicates */
table[k++].frequency =
VIRT_FREQ(i, freq_table[i][j].frequency);
}
}
Expand Down

0 comments on commit e32beb0

Please sign in to comment.