cpufreq: intel_pstate: Allow EPP 0x80 setting by the firmware

[linux-2.6-microblaze.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6ff73c3..ad9be31 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -298,6 +298,7 @@ static int hwp_active __read_mostly;
 static int hwp_mode_bdw __read_mostly;
 static bool per_cpu_limits __read_mostly;
 static bool hwp_boost __read_mostly;
+static bool hwp_forced __read_mostly;
 
 static struct cpufreq_driver *intel_pstate_driver __read_mostly;
 
@@ -1679,12 +1680,12 @@ static void intel_pstate_update_epp_defaults(struct cpudata *cpudata)
                return;
 
        /*
-        * If powerup EPP is something other than chipset default 0x80 and
-        * - is more performance oriented than 0x80 (default balance_perf EPP)
+        * If the EPP is set by firmware, which means that firmware enabled HWP
+        * - Is equal or less than 0x80 (default balance_perf EPP)
         * - But less performance oriented than performance EPP
         *   then use this as new balance_perf EPP.
         */
-       if (cpudata->epp_default < HWP_EPP_BALANCE_PERFORMANCE &&
+       if (hwp_forced && cpudata->epp_default <= HWP_EPP_BALANCE_PERFORMANCE &&
            cpudata->epp_default > HWP_EPP_PERFORMANCE) {
                epp_values[EPP_INDEX_BALANCE_PERFORMANCE] = cpudata->epp_default;
                return;
@@ -3384,7 +3385,7 @@ static int __init intel_pstate_init(void)
 
        id = x86_match_cpu(hwp_support_ids);
        if (id) {
-               bool hwp_forced = intel_pstate_hwp_is_enabled();
+               hwp_forced = intel_pstate_hwp_is_enabled();
 
                if (hwp_forced)
                        pr_info("HWP enabled by BIOS\n");