1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 66f7f0071cab..b230ebaae66c 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1070,8 +1070,9 @@ static inline bool intel_pstate_sample(struct cpudata *cpu, u64 time)
 
 static inline int32_t get_avg_frequency(struct cpudata *cpu)
 {
-        return div64_u64(cpu->pstate.max_pstate_physical * cpu->sample.aperf *
-                cpu->pstate.scaling, cpu->sample.mperf);
+        return fp_toint(mul_fp(cpu->sample.core_pct_busy,
+                               int_tofp(cpu->pstate.max_pstate_physical *
+                                                cpu->pstate.scaling / 100)));
 }
 
 static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu)
@@ -1114,8 +1115,6 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
         int32_t core_busy, max_pstate, current_pstate, sample_ratio;
         u64 duration_ns;
 
-        intel_pstate_calc_busy(cpu);
-
         /*
          * core_busy is the ratio of actual performance to max
          * max_pstate is the max non turbo pstate available
@@ -1199,8 +1198,11 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time,
         if ((s64)delta_ns >= pid_params.sample_rate_ns) {
                 bool sample_taken = intel_pstate_sample(cpu, time);
 
-                if (sample_taken && !hwp_active)
-                        intel_pstate_adjust_busy_pstate(cpu);
+                if (sample_taken) {
+                        intel_pstate_calc_busy(cpu);
+                        if (!hwp_active)
+                                intel_pstate_adjust_busy_pstate(cpu);
+                }
         }
 }