thermal: cpu_cooling: check for the readiness of cpufreq layer
In this patch, the cpu_cooling code checks for the usability of cpufreq layer before proceeding with the CPU cooling device registration. The main reason is: CPU cooling device is not usable if cpufreq cannot switch frequencies. Similar checks are spread in thermal drivers. Thus, the advantage now is to have the check in a single place: cpu cooling device registration. For this reason, this patch also updates the existing drivers that depend on CPU cooling to simply propagate the error code of the cpu cooling registration call. Therefore, in case cpufreq is not ready, the thermal drivers will still return -EPROBE_DEFER, in an attempt to try again when cpufreq layer gets ready. Cc: devicetree@vger.kernel.org Cc: Grant Likely <grant.likely@linaro.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: Naveen Krishna Chatradhi <ch.naveen@samsung.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Zhang Rui <rui.zhang@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
8891063871
commit
0f1be51c35
|
@ -443,6 +443,11 @@ __cpufreq_cooling_register(struct device_node *np,
|
||||||
int ret = 0, i;
|
int ret = 0, i;
|
||||||
struct cpufreq_policy policy;
|
struct cpufreq_policy policy;
|
||||||
|
|
||||||
|
if (!cpufreq_frequency_get_table(cpumask_first(clip_cpus))) {
|
||||||
|
pr_debug("%s: CPUFreq table not found\n", __func__);
|
||||||
|
return ERR_PTR(-EPROBE_DEFER);
|
||||||
|
}
|
||||||
|
|
||||||
/* Verify that all the clip cpus have same freq_min, freq_max limit */
|
/* Verify that all the clip cpus have same freq_min, freq_max limit */
|
||||||
for_each_cpu(i, clip_cpus) {
|
for_each_cpu(i, clip_cpus) {
|
||||||
/* continue if cpufreq policy not found and not return error */
|
/* continue if cpufreq policy not found and not return error */
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/cpu_cooling.h>
|
#include <linux/cpu_cooling.h>
|
||||||
#include <linux/cpufreq.h>
|
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
@ -30,10 +29,6 @@ static int db8500_cpufreq_cooling_probe(struct platform_device *pdev)
|
||||||
struct thermal_cooling_device *cdev;
|
struct thermal_cooling_device *cdev;
|
||||||
struct cpumask mask_val;
|
struct cpumask mask_val;
|
||||||
|
|
||||||
/* make sure cpufreq driver has been initialized */
|
|
||||||
if (!cpufreq_frequency_get_table(0))
|
|
||||||
return -EPROBE_DEFER;
|
|
||||||
|
|
||||||
cpumask_set_cpu(0, &mask_val);
|
cpumask_set_cpu(0, &mask_val);
|
||||||
cdev = cpufreq_cooling_register(&mask_val);
|
cdev = cpufreq_cooling_register(&mask_val);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
#include <linux/cpu_cooling.h>
|
#include <linux/cpu_cooling.h>
|
||||||
#include <linux/cpufreq.h>
|
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
@ -459,10 +458,6 @@ static int imx_thermal_probe(struct platform_device *pdev)
|
||||||
int measure_freq;
|
int measure_freq;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!cpufreq_get_current_driver()) {
|
|
||||||
dev_dbg(&pdev->dev, "no cpufreq driver!");
|
|
||||||
return -EPROBE_DEFER;
|
|
||||||
}
|
|
||||||
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data)
|
if (!data)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
|
@ -371,9 +371,11 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
|
||||||
th_zone->cool_dev[th_zone->cool_dev_size] =
|
th_zone->cool_dev[th_zone->cool_dev_size] =
|
||||||
cpufreq_cooling_register(&mask_val);
|
cpufreq_cooling_register(&mask_val);
|
||||||
if (IS_ERR(th_zone->cool_dev[th_zone->cool_dev_size])) {
|
if (IS_ERR(th_zone->cool_dev[th_zone->cool_dev_size])) {
|
||||||
dev_err(sensor_conf->dev,
|
ret = PTR_ERR(th_zone->cool_dev[th_zone->cool_dev_size]);
|
||||||
"Failed to register cpufreq cooling device\n");
|
if (ret != -EPROBE_DEFER)
|
||||||
ret = -EINVAL;
|
dev_err(sensor_conf->dev,
|
||||||
|
"Failed to register cpufreq cooling device: %d\n",
|
||||||
|
ret);
|
||||||
goto err_unregister;
|
goto err_unregister;
|
||||||
}
|
}
|
||||||
th_zone->cool_dev_size++;
|
th_zone->cool_dev_size++;
|
||||||
|
|
|
@ -683,7 +683,10 @@ static int exynos_tmu_probe(struct platform_device *pdev)
|
||||||
/* Register the sensor with thermal management interface */
|
/* Register the sensor with thermal management interface */
|
||||||
ret = exynos_register_thermal(sensor_conf);
|
ret = exynos_register_thermal(sensor_conf);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(&pdev->dev, "Failed to register thermal interface\n");
|
if (ret != -EPROBE_DEFER)
|
||||||
|
dev_err(&pdev->dev,
|
||||||
|
"Failed to register thermal interface: %d\n",
|
||||||
|
ret);
|
||||||
goto err_clk;
|
goto err_clk;
|
||||||
}
|
}
|
||||||
data->reg_conf = sensor_conf;
|
data->reg_conf = sensor_conf;
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/thermal.h>
|
#include <linux/thermal.h>
|
||||||
#include <linux/cpufreq.h>
|
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <linux/cpu_cooling.h>
|
#include <linux/cpu_cooling.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
@ -403,11 +402,6 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
|
||||||
if (!data)
|
if (!data)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (!cpufreq_get_current_driver()) {
|
|
||||||
dev_dbg(bgp->dev, "no cpufreq driver yet\n");
|
|
||||||
return -EPROBE_DEFER;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Register cooling device */
|
/* Register cooling device */
|
||||||
data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
|
data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
|
||||||
if (IS_ERR(data->cool_dev)) {
|
if (IS_ERR(data->cool_dev)) {
|
||||||
|
|
Loading…
Reference in a new issue