2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b87596b591b3..e93405f0eac4 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1491,6 +1491,9 @@ static unsigned int cpufreq_update_current_freq(struct cpufreq_policy *policy)
 {
         unsigned int new_freq;
 
+        if (cpufreq_suspended)
+                return 0;
+
         new_freq = cpufreq_driver->get(policy->cpu);
         if (!new_freq)
                 return 0;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 8b5a415ee14a..30fe323c4551 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1130,6 +1130,10 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
                 sample_ratio = div_fp(int_tofp(pid_params.sample_rate_ns),
                                       int_tofp(duration_ns));
                 core_busy = mul_fp(core_busy, sample_ratio);
+        } else {
+                sample_ratio = div_fp(100 * cpu->sample.mperf, cpu->sample.tsc);
+                if (sample_ratio < int_tofp(1))
+                        core_busy = 0;
         }
 
         cpu->sample.busy_scaled = core_busy;