cpufreq: intel_pstate: Broadwell mode HWP cleanup
Subsystems (2)
Rafael J. Wysocki
maintainercover cpufreq: intel_pstate: Broadwell mode HWP cleanup
Hi All,
This replaces
https://lore.kernel.org/linux-pm/[email protected]/
which was incomplete and kind of misguided.
Instead of trying to restore behavior from before 5 years ago, make the Broadwell mode of HWP only prevent hybrid scaling from being used which is the only effect of it in practice anyway (patch [1/2]).
On top of that rename a symbol (patch [2/2]).
Thanks!
Rafael J. Wysocki
maintainerPATCH 1/2 cpufreq: intel_pstate: Simplify HWP handling on Broadwell
From: "Rafael J. Wysocki" <[email protected]>
After commit de5bcf404ace ("cpufreq: intel_pstate: Clean up frequency computations"), the Broadwell HWP mode does not actually do anything useful because intel_pstate_get_hwp_cap() is called in intel_pstate_verify_cpu_policy() without checking the Broadwell mode and it overrides the initial turbo and max pstate values read from MSR_PLATFORM_INFO (the minimum P-state value still comes from MSR_PLATFORM_INFO if HWP is used even without the Broadwell mode).
Moreover, hwp_cap_cached is used in some places for updating MSR_HWP_REQUEST without checking the Broadwell mode either.
Effectively, the only difference made by the Broadwell HWP mode is skipping the hybrid initialization which may as well be achieved by avoiding to set pstate_funcs.get_cpu_scaling on Broadwell.
---
Applies on top of Linux 7.1.
--- drivers/cpufreq/intel_pstate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/cpufreq/intel_pstate.c +3 -4
@@ -299,7 +299,6 @@ struct pstate_funcs {static struct pstate_funcs pstate_funcs__read_mostly ;static bool hwp_active__ro_after_init ; -static int hwp_mode_bdw__ro_after_init ;static bool per_cpu_limits__ro_after_init ;static bool hwp_forced__ro_after_init ;static bool hwp_boost__read_mostly ;
@@ -2323,7 +2322,7 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) cpu->pstate.min_pstate = pstate_funcs.get_min (cpu->cpu); cpu->pstate.perf_ctl_scaling = perf_ctl_scaling; -if (hwp_active && !hwp_mode_bdw) { +if (hwp_active) {__intel_pstate_get_hwp_cap (cpu);if (pstate_funcs.get_cpu_scaling) {
@@ -3807,7 +3806,6 @@ static int __init intel_pstate_init(void)if (!no_hwp) { hwp_active = true; - hwp_mode_bdw = id->driver_data; intel_pstate.attr = hwp_cpufreq_attrs; intel_cpufreq.attr = hwp_cpufreq_attrs; intel_cpufreq.flags |=CPUFREQ_NEED_UPDATE_LIMITS ;
@@ -3815,7 +3813,8 @@ static int __init intel_pstate_init(void)if (!default_driver) default_driver = &intel_pstate; - pstate_funcs.get_cpu_scaling = hwp_get_cpu_scaling; +if (!id->driver_data) + pstate_funcs.get_cpu_scaling = hwp_get_cpu_scaling; goto hwp_cpu_matched; }
Signature · 1 line
2.51.0
Rafael J. Wysocki
maintainerPATCH 2/2 cpufreq: intel_pstate: Rename INTEL_PSTATE_HWP_BROADWELL
In reply to Rafael J. WysockiFrom: "Rafael J. Wysocki" <[email protected]>
Since the only role of INTEL_PSTATE_HWP_BROADWELL is to indicate that hybrid HWP should not be used, rename it to INTEL_PSTATE_HWP_NOT_HYBRID.
No functional impact.
--- drivers/cpufreq/intel_pstate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/cpufreq/intel_pstate.c +3 -3
@@ -3674,14 +3674,14 @@ static inline bool intel_pstate_has_acpi_ppc(void) { return false; }static inline void intel_pstate_request_control_from_smm (void ) {}#endif /* CONFIG_ACPI */ -#define INTEL_PSTATE_HWP_BROADWELL 0x01 +#define INTEL_PSTATE_HWP_NOT_HYBRID 0x01#define X86_MATCH_HWP (vfm, hwp_mode) \ X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_HWP, hwp_mode)static const struct x86_cpu_id hwp_support_ids[]__initconst = { -X86_MATCH_HWP (INTEL_BROADWELL_X ,INTEL_PSTATE_HWP_BROADWELL ), -X86_MATCH_HWP (INTEL_BROADWELL_D ,INTEL_PSTATE_HWP_BROADWELL ), +X86_MATCH_HWP (INTEL_BROADWELL_X ,INTEL_PSTATE_HWP_NOT_HYBRID ), +X86_MATCH_HWP (INTEL_BROADWELL_D ,INTEL_PSTATE_HWP_NOT_HYBRID ),X86_MATCH_HWP (INTEL_ANY ,0 ), {} };
Signature · 1 line
2.51.0