Now that all the blockers are gone for enabling stats in fast-switching
case, enable it.

Signed-off-by: Viresh Kumar <[email protected]>
---
 drivers/cpufreq/cpufreq.c       | 4 ++++
 drivers/cpufreq/cpufreq_stats.c | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2ea245a6c0c0..2d0e2e464b14 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2072,8 +2072,12 @@ unsigned int cpufreq_driver_fast_switch(struct 
cpufreq_policy *policy,
        target_freq = clamp_val(target_freq, policy->min, policy->max);
        freq = cpufreq_driver->fast_switch(policy, target_freq);
 
+       if (!freq)
+               return 0;
+
        arch_set_freq_scale(policy->related_cpus, freq,
                            policy->cpuinfo.max_freq);
+       cpufreq_stats_record_transition(policy, freq);
 
        return freq;
 }
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index bba04da3a278..8e7d64f34041 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -69,9 +69,6 @@ static ssize_t show_time_in_state(struct cpufreq_policy 
*policy, char *buf)
        ssize_t len = 0;
        int i;
 
-       if (policy->fast_switch_enabled)
-               return 0;
-
        for (i = 0; i < stats->state_num; i++) {
                if (pending) {
                        if (i == stats->last_index)
@@ -115,9 +112,6 @@ static ssize_t show_trans_table(struct cpufreq_policy 
*policy, char *buf)
        ssize_t len = 0;
        int i, j, count;
 
-       if (policy->fast_switch_enabled)
-               return 0;
-
        len += scnprintf(buf + len, PAGE_SIZE - len, "   From  :    To\n");
        len += scnprintf(buf + len, PAGE_SIZE - len, "         : ");
        for (i = 0; i < stats->state_num; i++) {
-- 
2.25.0.rc1.19.g042ed3e048af

Reply via email to