Commit 55d85293 authored by Viresh Kumar's avatar Viresh Kumar Committed by Eduardo Valentin

cpufreq: create cpufreq_table_count_valid_entries()

We need such a routine at two places already, lets create one.
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Tested-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 4d753aa7
...@@ -170,11 +170,10 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) ...@@ -170,11 +170,10 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
unsigned int i = 0, count = 0, ret = -ENOMEM; unsigned int i = 0, count = 0, ret = -ENOMEM;
struct cpufreq_stats *stats; struct cpufreq_stats *stats;
unsigned int alloc_size; unsigned int alloc_size;
struct cpufreq_frequency_table *pos, *table; struct cpufreq_frequency_table *pos;
/* We need cpufreq table for creating stats table */ count = cpufreq_table_count_valid_entries(policy);
table = policy->freq_table; if (!count)
if (unlikely(!table))
return; return;
/* stats already initialized */ /* stats already initialized */
...@@ -185,10 +184,6 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) ...@@ -185,10 +184,6 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
if (!stats) if (!stats)
return; return;
/* Find total allocation size */
cpufreq_for_each_valid_entry(pos, table)
count++;
alloc_size = count * sizeof(int) + count * sizeof(u64); alloc_size = count * sizeof(int) + count * sizeof(u64);
alloc_size += count * count * sizeof(int); alloc_size += count * count * sizeof(int);
...@@ -205,7 +200,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) ...@@ -205,7 +200,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
stats->max_state = count; stats->max_state = count;
/* Find valid-unique entries */ /* Find valid-unique entries */
cpufreq_for_each_valid_entry(pos, table) cpufreq_for_each_valid_entry(pos, policy->freq_table)
if (freq_table_get_index(stats, pos->frequency) == -1) if (freq_table_get_index(stats, pos->frequency) == -1)
stats->freq_table[i++] = pos->frequency; stats->freq_table[i++] = pos->frequency;
......
...@@ -739,7 +739,6 @@ __cpufreq_cooling_register(struct device_node *np, ...@@ -739,7 +739,6 @@ __cpufreq_cooling_register(struct device_node *np,
struct thermal_cooling_device *cdev; struct thermal_cooling_device *cdev;
struct cpufreq_cooling_device *cpufreq_cdev; struct cpufreq_cooling_device *cpufreq_cdev;
char dev_name[THERMAL_NAME_LENGTH]; char dev_name[THERMAL_NAME_LENGTH];
struct cpufreq_frequency_table *pos, *table;
unsigned int freq, i, num_cpus; unsigned int freq, i, num_cpus;
int ret; int ret;
struct thermal_cooling_device_ops *cooling_ops; struct thermal_cooling_device_ops *cooling_ops;
...@@ -750,9 +749,10 @@ __cpufreq_cooling_register(struct device_node *np, ...@@ -750,9 +749,10 @@ __cpufreq_cooling_register(struct device_node *np,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
table = policy->freq_table; i = cpufreq_table_count_valid_entries(policy);
if (!table) { if (!i) {
pr_debug("%s: CPUFreq table not found\n", __func__); pr_debug("%s: CPUFreq table not found or has no valid entries\n",
__func__);
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
...@@ -777,20 +777,16 @@ __cpufreq_cooling_register(struct device_node *np, ...@@ -777,20 +777,16 @@ __cpufreq_cooling_register(struct device_node *np,
goto free_time_in_idle; goto free_time_in_idle;
} }
/* Find max levels */ /* max_level is an index, not a counter */
cpufreq_for_each_valid_entry(pos, table) cpufreq_cdev->max_level = i - 1;
cpufreq_cdev->max_level++;
cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev->freq_table) * cpufreq_cdev->freq_table = kmalloc(sizeof(*cpufreq_cdev->freq_table) * i,
cpufreq_cdev->max_level, GFP_KERNEL); GFP_KERNEL);
if (!cpufreq_cdev->freq_table) { if (!cpufreq_cdev->freq_table) {
cdev = ERR_PTR(-ENOMEM); cdev = ERR_PTR(-ENOMEM);
goto free_time_in_idle_timestamp; goto free_time_in_idle_timestamp;
} }
/* max_level is an index, not a counter */
cpufreq_cdev->max_level--;
cpumask_copy(&cpufreq_cdev->allowed_cpus, policy->related_cpus); cpumask_copy(&cpufreq_cdev->allowed_cpus, policy->related_cpus);
if (capacitance) { if (capacitance) {
...@@ -816,7 +812,7 @@ __cpufreq_cooling_register(struct device_node *np, ...@@ -816,7 +812,7 @@ __cpufreq_cooling_register(struct device_node *np,
/* Fill freq-table in descending order of frequencies */ /* Fill freq-table in descending order of frequencies */
for (i = 0, freq = -1; i <= cpufreq_cdev->max_level; i++) { for (i = 0, freq = -1; i <= cpufreq_cdev->max_level; i++) {
freq = find_next_max(table, freq); freq = find_next_max(policy->freq_table, freq);
cpufreq_cdev->freq_table[i] = freq; cpufreq_cdev->freq_table[i] = freq;
/* Warn for duplicate entries */ /* Warn for duplicate entries */
......
...@@ -862,6 +862,20 @@ static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy, ...@@ -862,6 +862,20 @@ static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
return -EINVAL; return -EINVAL;
} }
} }
static inline int cpufreq_table_count_valid_entries(const struct cpufreq_policy *policy)
{
struct cpufreq_frequency_table *pos;
int count = 0;
if (unlikely(!policy->freq_table))
return 0;
cpufreq_for_each_valid_entry(pos, policy->freq_table)
count++;
return count;
}
#else #else
static inline int cpufreq_boost_trigger_state(int state) static inline int cpufreq_boost_trigger_state(int state)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment