1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 0d159b513469..ee367e9b7d2e 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1460,6 +1460,9 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 
         intel_pstate_clear_update_util_hook(policy->cpu);
 
+        pr_debug("set_policy cpuinfo.max %u policy->max %u\n",
+                 policy->cpuinfo.max_freq, policy->max);
+
         cpu = all_cpu_data[0];
         if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate &&
             policy->max < policy->cpuinfo.max_freq &&
@@ -1495,13 +1498,13 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
                                    limits->max_sysfs_pct);
         limits->max_perf_pct = max(limits->min_policy_pct,
                                    limits->max_perf_pct);
-        limits->max_perf = round_up(limits->max_perf, FRAC_BITS);
 
         /* Make sure min_perf_pct <= max_perf_pct */
         limits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);
 
         limits->min_perf = div_fp(limits->min_perf_pct, 100);
         limits->max_perf = div_fp(limits->max_perf_pct, 100);
+        limits->max_perf = round_up(limits->max_perf, FRAC_BITS);
 
  out:
         intel_pstate_set_update_util_hook(policy->cpu);
@@ -1558,8 +1561,11 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
 
         /* cpuinfo and default policy values */
         policy->cpuinfo.min_freq = cpu->pstate.min_pstate * cpu->pstate.scaling;
-        policy->cpuinfo.max_freq =
-                cpu->pstate.turbo_pstate * cpu->pstate.scaling;
+        update_turbo_state();
+        policy->cpuinfo.max_freq = limits->turbo_disabled ?
+                        cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;
+        policy->cpuinfo.max_freq *= cpu->pstate.scaling;
+
         intel_pstate_init_acpi_perf_limits(policy);
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
         cpumask_set_cpu(policy->cpu, policy->cpus);