cpufreq: Fix per-policy boost behavior on SoCs using cpufreq_boost_set_sw()

[ Upstream commit f37a4d6b4a2c77414e8b9d25dd5ee31537ce9b00 ]

In the existing code, per-policy flags don't have any impact i.e.
if cpufreq_driver boost is enabled and boost is disabled for one or
more of the policies, the cpufreq driver will behave as if boost is
enabled.

Fix this by incorporating per-policy boost flag in the policy->max
computation used in cpufreq_frequency_table_cpuinfo and setting the
default per-policy boost to mirror the cpufreq_driver boost flag.

Fixes: 218a06a79d9a ("cpufreq: Support per-policy performance boost")
Reported-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Dhruva Gole <d-gole@ti.com>
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
Tested-by:Yipeng Zou <zouyipeng@huawei.com> <mailto:zouyipeng@huawei.com>
Reviewed-by: Yipeng Zou <zouyipeng@huawei.com> <mailto:zouyipeng@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 44db4f59c4cc6cc839b062b8ab84efa6bad5b729..7d570b44777acf72b8337da3934dc9580fae8ac8 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -644,14 +644,16 @@ static ssize_t store_local_boost(struct cpufreq_policy *policy,
        if (policy->boost_enabled == enable)
                return count;
 
+       policy->boost_enabled = enable;
+
        cpus_read_lock();
        ret = cpufreq_driver->set_boost(policy, enable);
        cpus_read_unlock();
 
-       if (ret)
+       if (ret) {
+               policy->boost_enabled = !policy->boost_enabled;
                return ret;
-
-       policy->boost_enabled = enable;
+       }
 
        return count;
 }
@@ -1419,6 +1421,9 @@ static int cpufreq_online(unsigned int cpu)
                        goto out_free_policy;
                }
 
+               /* Let the per-policy boost flag mirror the cpufreq_driver boost during init */
+               policy->boost_enabled = cpufreq_boost_enabled() && policy_has_boost_freq(policy);
+
                /*
                 * The initialization has succeeded and the policy is online.
                 * If there is a problem with its frequency table, take it
@@ -2755,11 +2760,12 @@ int cpufreq_boost_trigger_state(int state)
 
        cpus_read_lock();
        for_each_active_policy(policy) {
+               policy->boost_enabled = state;
                ret = cpufreq_driver->set_boost(policy, state);
-               if (ret)
+               if (ret) {
+                       policy->boost_enabled = !policy->boost_enabled;
                        goto err_reset_state;
-
-               policy->boost_enabled = state;
+               }
        }
        cpus_read_unlock();
 

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index c4d4643b6ca6507ca85b134ecadcd0f1e0d82a5b..c17dc51a5a022d4b85558f69f3c21ec27ec2ba00 100644 (file)
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -40,7 +40,7 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
        cpufreq_for_each_valid_entry(pos, table) {
                freq = pos->frequency;
 
-               if (!cpufreq_boost_enabled()
+               if ((!cpufreq_boost_enabled() || !policy->boost_enabled)
                    && (pos->flags & CPUFREQ_BOOST_FREQ))
                        continue;