Commit f672c68c authored by Ayush Jain's avatar Ayush Jain Committed by Zheng Zengkai
Browse files

cpufreq/amd-pstate: Only print supported EPP values for performance governor 

stable inclusion
from stable-v6.6.5
commit 9d00fe295c8f309c21177114777f900971375928
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8N21P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9d00fe295c8f309c21177114777f900971375928



--------------------------------

[ Upstream commit 142c169b31beb364ef39385b4e88735bd51d37fe ]

show_energy_performance_available_preferences() to show only supported
values which is performance in performance governor policy.

-------Before--------
$ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_driver
amd-pstate-epp
$ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor
performance
$ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference
performance
$ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_available_preferences
default performance balance_performance balance_power power

-------After--------
$ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_driver
amd-pstate-epp
$ cat /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor
performance
$ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference
performance
$ cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_available_preferences
performance

Fixes: ffa5096a ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
Suggested-by: default avatarWyes Karny <wyes.karny@amd.com>
Signed-off-by: default avatarAyush Jain <ayush.jain3@amd.com>
Reviewed-by: default avatarWyes Karny <wyes.karny@amd.com>
Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f54416e0

drivers/cpufreq/amd-pstate.c

+6 −1
Original line number Diff line number Diff line
@@ -882,11 +882,16 @@ static ssize_t show_energy_performance_available_preferences( 
{

	int i = 0;

	int offset = 0;

	struct amd_cpudata *cpudata = policy->driver_data;



	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)

		return sysfs_emit_at(buf, offset, "%s\n",

				energy_perf_strings[EPP_INDEX_PERFORMANCE]);



	while (energy_perf_strings[i] != NULL)

		offset += sysfs_emit_at(buf, offset, "%s ", energy_perf_strings[i++]);



	sysfs_emit_at(buf, offset, "\n");

	offset += sysfs_emit_at(buf, offset, "\n");



	return offset;

}