Power management fix for 5.4-rc7

Fix an "unchecked MSR access" warning in the intel_pstate cpufreq
 driver (Srinivas Pandruvada).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAl3FRSYSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxpP4P/j+T+8XlsBcFm7GsyKPAv8ZS59zEmIfK
 9Ww/k7r6QLl6h2ljRmh+jUGkZ7PNn3yRYezETaMLLQbveIMX8CsGBT/hvjMDdRaD
 s0OKGUg50ix1NkUNv4GsS0nnmYjk/7LAHPbwXJez1S1E1Rc/ZgcSlPU8/5MQGhY9
 OfOOYlAgbMz+ilmd5USTWgazIe+mDAcQaxUL1bVWnm0NkLPYEA7W4pei20T4pq0Q
 HsREWet7QfZQhJNti+mRk7OJUM65vX9/6rSFdBYPabcIgpORktZ7kSw5DdQa3Zqn
 pumAbavV8Ra2X8C7iM17/w+XlqiRqHAFmhQGXAnQYDJ4Kvsg7bhT4l0AF77vcr80
 jqzDIFrothWg9PF20kmks971Lxz8/GDli2PcK8hBYMHJa79id5/H4mc/T1TV32aQ
 8pToMkBkkpwpCodTvNWCbZJO/57XS8Jac9qmU5KcmHHHBSiQSnlZPDehRrfKatG5
 NJDRjbXD5kwpxBCRwk9AGWmS4nlJEf7IiMPH1E3rRg/+vT19OTilHA34m5pOcwHz
 A9odsBPUJHgSrpjPRPjT24WqsOKpPeEVs0smgx2s30E88ocHsXGDjC01OjRbo1ap
 eHurtFuT0MZ4Jgef9D8kqKr1D0YfoAwKpyOOIYcMAsnHRH5/sOSSBeOo9kOFUe+N
 CSPeICJSzWV/
 =ED27
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-11-08 08:33:32 -08:00
commit 4d8b3262af
1 changed files with 1 additions and 3 deletions

View File

@ -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);
}