Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Power management fixes for 6.11-rc6

Browse Source 
- Remove checks for highest performance match on preferred cores when
    updating preferred core ranking in amd-pstate (Mario Limonciello).
 
  - Make amd-pstate call topology_logical_package_id() instead of
    logical_die_id() to get a socked ID for a CPU (Gautham Shenoy).
 
  - Fix uninitialized variable in amd_pstate_cpu_boost_update() (Dan
    Carpenter).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmbR+ToSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRx6XoQAIOs/EUF5iVXRpEXhxxKBJbi9r/0hShy
 mIS/iSxfEgaK4C19fgMlHpnCv6n6nnvnmW72nf3Ob7TkvuBhLXKnU6KgIglp6Tqe
 ZgruZlP/dpEwU4K74XMjhlZ8lZVPqLtOWayC7+J118Keu8oEtaxYRA78flkHqs6l
 ORHFn03/6ldmxIVxSUzVxAFuaXCAI8PwF7U+NvIrfL8Xl3qrX9GJZwJvbEDkpQsq
 0cdCn2FI+4dLuLvxrUTnPzSuNya+OpYvgDEPmuXr+hcTCRHG3eZqp2xjRU62sHA+
 B8ly2FcoiXSEj7IzIbpGcA2wQUt5y9KlWZ/ig999eQ6DgUeIILs72m/Dy/GfBOpa
 w8f39gGtbmJ2ddi+hmGTrNGkUesqLvg/dTyIarwHgOsbtoXkrochafn2i9VZ9EKa
 6c40k8GOaUC40SOXskJEu7wj2YtP8toc+Y7pPGxhq4Q0Xqa8uA7my1YgRTwmyTqq
 Pa6kcrYpM3bVDOnfbWX6w61UlybtE0/2/QGfkOxM80GmUGXrl0uXvOhGVxWNrCpo
 pUqLl09qa5k/pAfSXq1g1fRDTxv4s6z7iCQwnEczVllCqrAUSg1+9eKXHoo6xd9l
 cy7hy8OqLZ6ODSTjZfZyympRISlj9hi+lhRu8lcQoMBG1531smyjXoHgkY1gOyV6
 FeT3h0902XUq
 =iZ8s
 -----END PGP SIGNATURE-----

Merge tag 'pm-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix three issues in the amd-pstate cpufreq driver.

  Specifics:

   - Remove checks for highest performance match on preferred cores when
     updating preferred core ranking in amd-pstate (Mario Limonciello)

   - Make amd-pstate call topology_logical_package_id() instead of
     logical_die_id() to get a socked ID for a CPU (Gautham Shenoy)

   - Fix uninitialized variable in amd_pstate_cpu_boost_update() (Dan
     Carpenter)"

* tag 'pm-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq/amd-pstate-ut: Don't check for highest perf matching on prefcore
  cpufreq/amd-pstate: Use topology_logical_package_id() instead of logical_die_id()
  cpufreq: amd-pstate: Fix uninitialized variable in amd_pstate_cpu_boost_update()
This commit is contained in:
Linus Torvalds 2024-08-31 06:25:34 +12:00
commit fb1a804535
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/cpufreq/amd-pstate-ut.c
View File

@ -160,14 +160,17 @@ static void amd_pstate_ut_check_perf(u32 index)
lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
}
if ((highest_perf != READ_ONCE(cpudata->highest_perf)) ||
(nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||
if (highest_perf != READ_ONCE(cpudata->highest_perf) && !cpudata->hw_prefcore) {
pr_err("%s cpu%d highest=%d %d highest perf doesn't match\n",
__func__, cpu, highest_perf, cpudata->highest_perf);
goto skip_test;
}
if ((nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||
(lowest_nonlinear_perf != READ_ONCE(cpudata->lowest_nonlinear_perf)) ||
(lowest_perf != READ_ONCE(cpudata->lowest_perf))) {
amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
pr_err("%s cpu%d highest=%d %d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",
__func__, cpu, highest_perf, cpudata->highest_perf,
nominal_perf, cpudata->nominal_perf,
pr_err("%s cpu%d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",
__func__, cpu, nominal_perf, cpudata->nominal_perf,
lowest_nonlinear_perf, cpudata->lowest_nonlinear_perf,
lowest_perf, cpudata->lowest_perf);
goto skip_test;

4
drivers/cpufreq/amd-pstate.c
View File

@ -321,7 +321,7 @@ static inline int pstate_enable(bool enable)
return 0;
for_each_present_cpu(cpu) {
unsigned long logical_id = topology_logical_die_id(cpu);
unsigned long logical_id = topology_logical_package_id(cpu);
if (test_bit(logical_id, &logical_proc_id_mask))
continue;
@ -692,7 +692,7 @@ static int amd_pstate_cpu_boost_update(struct cpufreq_policy *policy, bool on)
struct amd_cpudata *cpudata = policy->driver_data;
struct cppc_perf_ctrls perf_ctrls;
u32 highest_perf, nominal_perf, nominal_freq, max_freq;
int ret;
int ret = 0;
highest_perf = READ_ONCE(cpudata->highest_perf);
nominal_perf = READ_ONCE(cpudata->nominal_perf);