|
@@ -311,12 +311,20 @@ static DEFINE_MUTEX(intel_pstate_limits_lock);
|
|
|
|
|
|
#ifdef CONFIG_ACPI
|
|
#ifdef CONFIG_ACPI
|
|
|
|
|
|
-static bool intel_pstate_get_ppc_enable_status(void)
|
|
|
|
|
|
+static bool intel_pstate_acpi_pm_profile_server(void)
|
|
{
|
|
{
|
|
if (acpi_gbl_FADT.preferred_profile == PM_ENTERPRISE_SERVER ||
|
|
if (acpi_gbl_FADT.preferred_profile == PM_ENTERPRISE_SERVER ||
|
|
acpi_gbl_FADT.preferred_profile == PM_PERFORMANCE_SERVER)
|
|
acpi_gbl_FADT.preferred_profile == PM_PERFORMANCE_SERVER)
|
|
return true;
|
|
return true;
|
|
|
|
|
|
|
|
+ return false;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static bool intel_pstate_get_ppc_enable_status(void)
|
|
|
|
+{
|
|
|
|
+ if (intel_pstate_acpi_pm_profile_server())
|
|
|
|
+ return true;
|
|
|
|
+
|
|
return acpi_ppc;
|
|
return acpi_ppc;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -459,6 +467,11 @@ static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *pol
|
|
static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)
|
|
static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)
|
|
{
|
|
{
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+static inline bool intel_pstate_acpi_pm_profile_server(void)
|
|
|
|
+{
|
|
|
|
+ return false;
|
|
|
|
+}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
static inline void update_turbo_state(void)
|
|
static inline void update_turbo_state(void)
|
|
@@ -1841,7 +1854,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
|
|
intel_pstate_hwp_enable(cpu);
|
|
intel_pstate_hwp_enable(cpu);
|
|
|
|
|
|
id = x86_match_cpu(intel_pstate_hwp_boost_ids);
|
|
id = x86_match_cpu(intel_pstate_hwp_boost_ids);
|
|
- if (id)
|
|
|
|
|
|
+ if (id && intel_pstate_acpi_pm_profile_server())
|
|
hwp_boost = true;
|
|
hwp_boost = true;
|
|
}
|
|
}
|
|
|
|
|