diff options
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 3c3971256130..d4ed0022b0dd 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
@@ -311,12 +311,20 @@ static DEFINE_MUTEX(intel_pstate_limits_lock); | |||
311 | 311 | ||
312 | #ifdef CONFIG_ACPI | 312 | #ifdef CONFIG_ACPI |
313 | 313 | ||
314 | static bool intel_pstate_get_ppc_enable_status(void) | 314 | static bool intel_pstate_acpi_pm_profile_server(void) |
315 | { | 315 | { |
316 | if (acpi_gbl_FADT.preferred_profile == PM_ENTERPRISE_SERVER || | 316 | if (acpi_gbl_FADT.preferred_profile == PM_ENTERPRISE_SERVER || |
317 | acpi_gbl_FADT.preferred_profile == PM_PERFORMANCE_SERVER) | 317 | acpi_gbl_FADT.preferred_profile == PM_PERFORMANCE_SERVER) |
318 | return true; | 318 | return true; |
319 | 319 | ||
320 | return false; | ||
321 | } | ||
322 | |||
323 | static bool intel_pstate_get_ppc_enable_status(void) | ||
324 | { | ||
325 | if (intel_pstate_acpi_pm_profile_server()) | ||
326 | return true; | ||
327 | |||
320 | return acpi_ppc; | 328 | return acpi_ppc; |
321 | } | 329 | } |
322 | 330 | ||
@@ -459,6 +467,11 @@ static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *pol | |||
459 | static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) | 467 | static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) |
460 | { | 468 | { |
461 | } | 469 | } |
470 | |||
471 | static inline bool intel_pstate_acpi_pm_profile_server(void) | ||
472 | { | ||
473 | return false; | ||
474 | } | ||
462 | #endif | 475 | #endif |
463 | 476 | ||
464 | static inline void update_turbo_state(void) | 477 | static inline void update_turbo_state(void) |
@@ -1841,7 +1854,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum) | |||
1841 | intel_pstate_hwp_enable(cpu); | 1854 | intel_pstate_hwp_enable(cpu); |
1842 | 1855 | ||
1843 | id = x86_match_cpu(intel_pstate_hwp_boost_ids); | 1856 | id = x86_match_cpu(intel_pstate_hwp_boost_ids); |
1844 | if (id) | 1857 | if (id && intel_pstate_acpi_pm_profile_server()) |
1845 | hwp_boost = true; | 1858 | hwp_boost = true; |
1846 | } | 1859 | } |
1847 | 1860 | ||