| From f840ab18bdf2e415dac21d09fbbbd2873111bd48 Mon Sep 17 00:00:00 2001 |
| From: Lukasz Luba <lukasz.luba@arm.com> |
| Date: Tue, 31 May 2016 11:32:02 +0100 |
| Subject: thermal: cpu_cooling: fix improper order during initialization |
| |
| From: Lukasz Luba <lukasz.luba@arm.com> |
| |
| commit f840ab18bdf2e415dac21d09fbbbd2873111bd48 upstream. |
| |
| The freq_table array is not populated before calling |
| thermal_of_cooling_register. The code which populates the freq table was |
| introduced in commit f6859014. |
| This should be done before registering new thermal cooling device. |
| The log shows effects of this wrong decision. |
| [ 2.172614] cpu cpu1: Failed to get voltage for frequency 1984518656000: -34 |
| [ 2.220863] cpu cpu0: Failed to get voltage for frequency 1984524416000: -34 |
| |
| Fixes: f6859014c7e7 ("thermal: cpu_cooling: Store frequencies in descending order") |
| Signed-off-by: Lukasz Luba <lukasz.luba@arm.com> |
| Acked-by: Javi Merino <javi.merino@arm.com> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Signed-off-by: Zhang Rui <rui.zhang@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/thermal/cpu_cooling.c | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/thermal/cpu_cooling.c |
| +++ b/drivers/thermal/cpu_cooling.c |
| @@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device |
| goto free_power_table; |
| } |
| |
| - snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d", |
| - cpufreq_dev->id); |
| - |
| - cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev, |
| - &cpufreq_cooling_ops); |
| - if (IS_ERR(cool_dev)) |
| - goto remove_idr; |
| - |
| /* Fill freq-table in descending order of frequencies */ |
| for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) { |
| freq = find_next_max(table, freq); |
| @@ -877,6 +869,14 @@ __cpufreq_cooling_register(struct device |
| pr_debug("%s: freq:%u KHz\n", __func__, freq); |
| } |
| |
| + snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d", |
| + cpufreq_dev->id); |
| + |
| + cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev, |
| + &cpufreq_cooling_ops); |
| + if (IS_ERR(cool_dev)) |
| + goto remove_idr; |
| + |
| cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0]; |
| cpufreq_dev->cool_dev = cool_dev; |
| |