Skip to content

Commit d90adb5

Browse files
committed
Merge tag 'amd-pstate-v6.13-2024-10-29' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux
Merge amd-pstate driver updates for 6.13 from Mario Limonciello: "Update the amd-pstate driver to set the initial scaling frequency policy lower bound to be lowest non-linear frequency. This will have a slight power consumption impact but should lead to increased efficiency. Also amd-pstate is enabled by default on servers starting with newer AMD Epyc processors. Align more codepaths between shared memory and MSR designs. Add various code cleanups to rename functions and remove redundant calls." * tag 'amd-pstate-v6.13-2024-10-29' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux: cpufreq/amd-pstate: Move registration after static function call update cpufreq/amd-pstate: Push adjust_perf vfunc init into cpu_init cpufreq/amd-pstate: Align offline flow of shared memory and MSR based systems cpufreq/amd-pstate: Call cppc_set_epp_perf in the reenable function cpufreq/amd-pstate: Do not attempt to clear MSR_AMD_CPPC_ENABLE cpufreq/amd-pstate: Rename functions that enable CPPC cpufreq/amd-pstate-ut: Add fix for min freq unit test amd-pstate: Switch to amd-pstate by default on some Server platforms amd-pstate: Set min_perf to nominal_perf for active mode performance gov cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call cpufreq/amd-pstate: Remove the switch case in amd_pstate_init() cpufreq/amd-pstate: Call amd_pstate_set_driver() in amd_pstate_register_driver() cpufreq/amd-pstate: Call amd_pstate_register() in amd_pstate_init() cpufreq/amd-pstate: Set the initial min_freq to lowest_nonlinear_freq cpufreq/amd-pstate: Remove the redundant verify() function cpufreq/amd-pstate: Drop needless EPP initialization cpufreq/amd-pstate: Use amd_pstate_update_min_max_limit() for EPP limits cpufreq/amd-pstate: Don't update CPPC request in amd_pstate_cpu_boost_update() cpufreq/amd-pstate: Fix non kerneldoc comment cpufreq/amd-pstate: Rename MSR and shared memory specific functions
2 parents a9dedaa + ff2653d commit d90adb5

File tree

2 files changed

+97
-138
lines changed

2 files changed

+97
-138
lines changed

drivers/cpufreq/amd-pstate-ut.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ static void amd_pstate_ut_check_freq(u32 index)
227227
goto skip_test;
228228
}
229229

230-
if (cpudata->min_freq != policy->min) {
230+
if (cpudata->lowest_nonlinear_freq != policy->min) {
231231
amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
232-
pr_err("%s cpu%d cpudata_min_freq=%d policy_min=%d, they should be equal!\n",
233-
__func__, cpu, cpudata->min_freq, policy->min);
232+
pr_err("%s cpu%d cpudata_lowest_nonlinear_freq=%d policy_min=%d, they should be equal!\n",
233+
__func__, cpu, cpudata->lowest_nonlinear_freq, policy->min);
234234
goto skip_test;
235235
}
236236

0 commit comments

Comments
 (0)