Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f840ab18 authored by Lukasz Luba's avatar Lukasz Luba Committed by Zhang Rui
Browse files

thermal: cpu_cooling: fix improper order during initialization 



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

Cc: <stable@vger.kernel.org> # 3.19+
Fixes: f6859014 ("thermal: cpu_cooling: Store frequencies in descending order")
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Acked-by: default avatarJavi Merino <javi.merino@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 852f42a6

drivers/thermal/cpu_cooling.c

+8 −8
Original line number Diff line number Diff line
@@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device_node *np, 
		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_node *np, 
			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;