Commit 3cbf6a8a authored by Lukasz Luba's avatar Lukasz Luba Committed by Daniel Lezcano

drivers/thermal/cpufreq_cooling: Use private callback ops for each cooling device

It is very unlikely that one CPU cluster would have the EM and some other
won't have it (because EM registration failed or DT lacks needed entry).
Although, we should avoid modifying global variable with callbacks anyway.
Redesign this and add safety for such situation.
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20220613124327.30766-2-lukasz.luba@arm.comSigned-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 62f46fc7
...@@ -59,6 +59,7 @@ struct time_in_idle { ...@@ -59,6 +59,7 @@ struct time_in_idle {
* @cdev: thermal_cooling_device pointer to keep track of the * @cdev: thermal_cooling_device pointer to keep track of the
* registered cooling device. * registered cooling device.
* @policy: cpufreq policy. * @policy: cpufreq policy.
* @cooling_ops: cpufreq callbacks to thermal cooling device ops
* @idle_time: idle time stats * @idle_time: idle time stats
* @qos_req: PM QoS contraint to apply * @qos_req: PM QoS contraint to apply
* *
...@@ -71,6 +72,7 @@ struct cpufreq_cooling_device { ...@@ -71,6 +72,7 @@ struct cpufreq_cooling_device {
unsigned int max_level; unsigned int max_level;
struct em_perf_domain *em; struct em_perf_domain *em;
struct cpufreq_policy *policy; struct cpufreq_policy *policy;
struct thermal_cooling_device_ops cooling_ops;
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
struct time_in_idle *idle_time; struct time_in_idle *idle_time;
#endif #endif
...@@ -485,14 +487,6 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, ...@@ -485,14 +487,6 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,
return ret; return ret;
} }
/* Bind cpufreq callbacks to thermal cooling device ops */
static struct thermal_cooling_device_ops cpufreq_cooling_ops = {
.get_max_state = cpufreq_get_max_state,
.get_cur_state = cpufreq_get_cur_state,
.set_cur_state = cpufreq_set_cur_state,
};
/** /**
* __cpufreq_cooling_register - helper function to create cpufreq cooling device * __cpufreq_cooling_register - helper function to create cpufreq cooling device
* @np: a valid struct device_node to the cooling device device tree node * @np: a valid struct device_node to the cooling device device tree node
...@@ -554,7 +548,10 @@ __cpufreq_cooling_register(struct device_node *np, ...@@ -554,7 +548,10 @@ __cpufreq_cooling_register(struct device_node *np,
/* max_level is an index, not a counter */ /* max_level is an index, not a counter */
cpufreq_cdev->max_level = i - 1; cpufreq_cdev->max_level = i - 1;
cooling_ops = &cpufreq_cooling_ops; cooling_ops = &cpufreq_cdev->cooling_ops;
cooling_ops->get_max_state = cpufreq_get_max_state;
cooling_ops->get_cur_state = cpufreq_get_cur_state;
cooling_ops->set_cur_state = cpufreq_set_cur_state;
#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR #ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR
if (em_is_sane(cpufreq_cdev, em)) { if (em_is_sane(cpufreq_cdev, em)) {
......
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