summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-11-08 08:33:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-11-08 08:33:32 -0800
commit4d8b3262af02c4245ac396b7f2bc71eb328931e2 (patch)
tree01a4aafc86f61491b3fd6618d9cb1cb231291ac2
parent8ac2a114b1144a5d5f9043e67c769f21a4512c2a (diff)
parentc31432fa7f825de0e19838f1ac7746381c509ec4 (diff)
downloadlwn-4d8b3262af02c4245ac396b7f2bc71eb328931e2.tar.gz
lwn-4d8b3262af02c4245ac396b7f2bc71eb328931e2.zip
Merge tag 'pm-5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Fix an 'unchecked MSR access' warning in the intel_pstate cpufreq driver (Srinivas Pandruvada)" * tag 'pm-5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: intel_pstate: Fix invalid EPB setting
-rw-r--r--drivers/cpufreq/intel_pstate.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 53a51c169451..8ab31702cf6a 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -847,11 +847,9 @@ static void intel_pstate_hwp_force_min_perf(int cpu)
value |= HWP_MAX_PERF(min_perf);
value |= HWP_MIN_PERF(min_perf);
- /* Set EPP/EPB to min */
+ /* Set EPP to min */
if (boot_cpu_has(X86_FEATURE_HWP_EPP))
value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE);
- else
- intel_pstate_set_epb(cpu, HWP_EPP_BALANCE_POWERSAVE);
wrmsrl_on_cpu(cpu, MSR_HWP_REQUEST, value);
}