thermal: cpu_cooling: Aggregate cooling device vote for all related CPUs
There can be multiple cpu cooling devices among same related CPUs
and these cpu cooling devices can place different request at same
time. In such cases, it needs to check and aggregate request for
all cooling devices of related CPUs of that cpu freq policy.
Add support to aggregate cpu cooling vote for all related CPUs cooling
devices in cpu frequency callback.
Change-Id: I0a7a7be98458ac7a3902f2be4d98b025128c4c8a
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index f25bade..9e96f8a 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -330,7 +330,7 @@
unsigned long event, void *data)
{
struct cpufreq_policy *policy = data;
- unsigned long clipped_freq, floor_freq;
+ unsigned long clipped_freq = ULONG_MAX, floor_freq = 0;
struct cpufreq_cooling_device *cpufreq_dev;
if (event != CPUFREQ_ADJUST)
@@ -338,31 +338,30 @@
mutex_lock(&cooling_list_lock);
list_for_each_entry(cpufreq_dev, &cpufreq_dev_list, node) {
- if (!cpumask_test_cpu(policy->cpu, &cpufreq_dev->allowed_cpus))
+ if (!cpumask_intersects(&cpufreq_dev->allowed_cpus,
+ policy->related_cpus))
continue;
-
- /*
- * policy->max is the maximum allowed frequency defined by user
- * and clipped_freq is the maximum that thermal constraints
- * allow.
- *
- * If clipped_freq is lower than policy->max, then we need to
- * readjust policy->max.
- *
- * But, if clipped_freq is greater than policy->max, we don't
- * need to do anything.
- *
- * Similarly, if policy minimum set by the user is less than
- * the floor_frequency, then adjust the policy->min.
- */
- clipped_freq = cpufreq_dev->clipped_freq;
- floor_freq = cpufreq_dev->floor_freq;
-
- if (policy->max > clipped_freq || policy->min < floor_freq)
- cpufreq_verify_within_limits(policy, floor_freq,
- clipped_freq);
- break;
+ if (cpufreq_dev->clipped_freq < clipped_freq)
+ clipped_freq = cpufreq_dev->clipped_freq;
+ if (cpufreq_dev->floor_freq > floor_freq)
+ floor_freq = cpufreq_dev->floor_freq;
}
+ /*
+ * policy->max is the maximum allowed frequency defined by user
+ * and clipped_freq is the maximum that thermal constraints
+ * allow.
+ *
+ * If clipped_freq is lower than policy->max, then we need to
+ * readjust policy->max.
+ *
+ * But, if clipped_freq is greater than policy->max, we don't
+ * need to do anything.
+ *
+ * Similarly, if policy minimum set by the user is less than
+ * the floor_frequency, then adjust the policy->min.
+ */
+ if (policy->max > clipped_freq || policy->min < floor_freq)
+ cpufreq_verify_within_limits(policy, floor_freq, clipped_freq);
mutex_unlock(&cooling_list_lock);
return NOTIFY_OK;