]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cpufreq: intel_pstate: Enable HWP without EPP if DEC is enabled
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 11 Sep 2025 12:02:33 +0000 (14:02 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 19 Sep 2025 21:05:54 +0000 (23:05 +0200)
So far, HWP has never been enabled without EPP (Energy-Performance
Preference) interface support, since the lack of the latter indicates an
incomplete implementation of HWP, which was the case on early development
vehicle platforms.  However, HWP can be expected to work if DEC (Dynamic
Efficiency Control) is enabled as indicated by setting bit 27 in
MSR_IA32_POWER_CTL (DEC enable bit).

Accordingly, allow HWP to be enabled if the EPP interface is not
supported so long as DEC is enabled in the processor.

Still, the EPP control sysfs interface is useless when EPP is not
supported, so do not expose it in that case.

Link: https://lore.kernel.org/linux-pm/20250904000608.260817-2-srinivas.pandruvada@linux.intel.com/
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Co-developed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/intel_pstate.c

index 20746c35d3ba27d19a95f8225111828df2284570..285051e4a5dd86d65afdf941d5caf0ab03ee01ed 100644 (file)
@@ -897,11 +897,19 @@ static ssize_t show_base_frequency(struct cpufreq_policy *policy, char *buf)
 
 cpufreq_freq_attr_ro(base_frequency);
 
+enum hwp_cpufreq_attr_index {
+       HWP_BASE_FREQUENCY_INDEX = 0,
+       HWP_PERFORMANCE_PREFERENCE_INDEX,
+       HWP_PERFORMANCE_AVAILABLE_PREFERENCES_INDEX,
+       HWP_CPUFREQ_ATTR_COUNT,
+};
+
 static struct freq_attr *hwp_cpufreq_attrs[] = {
-       &energy_performance_preference,
-       &energy_performance_available_preferences,
-       &base_frequency,
-       NULL,
+       [HWP_BASE_FREQUENCY_INDEX] = &base_frequency,
+       [HWP_PERFORMANCE_PREFERENCE_INDEX] = &energy_performance_preference,
+       [HWP_PERFORMANCE_AVAILABLE_PREFERENCES_INDEX] =
+                               &energy_performance_available_preferences,
+       [HWP_CPUFREQ_ATTR_COUNT] = NULL,
 };
 
 static bool no_cas __ro_after_init;
@@ -1370,6 +1378,9 @@ static void intel_pstate_hwp_offline(struct cpudata *cpu)
 #define POWER_CTL_EE_ENABLE    1
 #define POWER_CTL_EE_DISABLE   2
 
+/* Enable bit for Dynamic Efficiency Control (DEC) */
+#define POWER_CTL_DEC_ENABLE   27
+
 static int power_ctl_ee_state;
 
 static void set_power_ctl_ee_state(bool input)
@@ -3758,6 +3769,26 @@ static const struct x86_cpu_id intel_hybrid_scaling_factor[] = {
        {}
 };
 
+static bool hwp_check_epp(void)
+{
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP))
+               return true;
+
+       /* Without EPP support, don't expose EPP-related sysfs attributes. */
+       hwp_cpufreq_attrs[HWP_PERFORMANCE_PREFERENCE_INDEX] = NULL;
+       hwp_cpufreq_attrs[HWP_PERFORMANCE_AVAILABLE_PREFERENCES_INDEX] = NULL;
+
+       return false;
+}
+
+static bool hwp_check_dec(void)
+{
+       u64 power_ctl;
+
+       rdmsrq(MSR_IA32_POWER_CTL, power_ctl);
+       return !!(power_ctl & BIT(POWER_CTL_DEC_ENABLE));
+}
+
 static int __init intel_pstate_init(void)
 {
        static struct cpudata **_all_cpu_data;
@@ -3778,23 +3809,32 @@ static int __init intel_pstate_init(void)
 
        id = x86_match_cpu(hwp_support_ids);
        if (id) {
-               hwp_forced = intel_pstate_hwp_is_enabled();
+               bool epp_present = hwp_check_epp();
 
-               if (hwp_forced)
+               /*
+                * If HWP is enabled already, there is no choice but to deal
+                * with it.
+                */
+               hwp_forced = intel_pstate_hwp_is_enabled();
+               if (hwp_forced) {
                        pr_info("HWP enabled by BIOS\n");
-               else if (no_load)
+                       no_hwp = 0;
+               } else if (no_load) {
                        return -ENODEV;
+               } else if (!epp_present && !hwp_check_dec()) {
+                       /*
+                        * Avoid enabling HWP for processors without EPP support
+                        * unless the Dynamic Efficiency Control (DEC) enable
+                        * bit (MSR_IA32_POWER_CTL, bit 27) is set because that
+                        * means incomplete HWP implementation which is a corner
+                        * case and supporting it is generally problematic.
+                        */
+                       no_hwp = 1;
+               }
 
                copy_cpu_funcs(&core_funcs);
-               /*
-                * Avoid enabling HWP for processors without EPP support,
-                * because that means incomplete HWP implementation which is a
-                * corner case and supporting it is generally problematic.
-                *
-                * If HWP is enabled already, though, there is no choice but to
-                * deal with it.
-                */
-               if ((!no_hwp && boot_cpu_has(X86_FEATURE_HWP_EPP)) || hwp_forced) {
+
+               if (!no_hwp) {
                        hwp_active = true;
                        hwp_mode_bdw = id->driver_data;
                        intel_pstate.attr = hwp_cpufreq_attrs;