Commit 3a3ecfdb authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Shuah Khan
Browse files

cpupower: Add cpuid cap flag for MSR_AMD_HWCR support 



Remove the family check for accessing the MSR_AMD_HWCR MSR and replace
it with a cpupower cap flag.

This update also allows for the removal of the local cpupower_cpu_info
variable in cpufreq_has_boost_support() since we no longer need it to
check the family.

Signed-off-by: default avatarNathan Fontenot <nathan.fontenot@amd.com>
Reviewed-by: default avatarRobert Richter <rrichter@amd.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent d1abc4e9

tools/power/cpupower/utils/helpers/cpuid.c

+5 −1
Original line number Diff line number Diff line
@@ -129,9 +129,13 @@ int get_cpu_info(struct cpupower_cpu_info *cpu_info) 
	if (cpu_info->vendor == X86_VENDOR_AMD ||

	    cpu_info->vendor == X86_VENDOR_HYGON) {

		if (ext_cpuid_level >= 0x80000007) {

			if (cpuid_edx(0x80000007) & (1 << 9))

			if (cpuid_edx(0x80000007) & (1 << 9)) {

				cpu_info->caps |= CPUPOWER_CAP_AMD_CPB;



				if (cpu_info->family >= 0x17)

					cpu_info->caps |= CPUPOWER_CAP_AMD_CPB_MSR;

			}



			if ((cpuid_edx(0x80000007) & (1 << 7)) &&

			    cpu_info->family != 0x14) {

				/* HW pstate was not implemented in family 0x14 */

tools/power/cpupower/utils/helpers/helpers.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN = 0, X86_VENDOR_INTEL, 
#define CPUPOWER_CAP_AMD_RDPRU		0x00000080

#define CPUPOWER_CAP_AMD_HW_PSTATE	0x00000100

#define CPUPOWER_CAP_AMD_PSTATEDEF	0x00000200

#define CPUPOWER_CAP_AMD_CPB_MSR	0x00000400



#define CPUPOWER_AMD_CPBDIS		0x02000000

tools/power/cpupower/utils/helpers/misc.c

+1 −6
Original line number Diff line number Diff line
@@ -16,16 +16,11 @@ 
int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,

			int *states)

{

	struct cpupower_cpu_info cpu_info;

	int ret;

	unsigned long long val;



	*support = *active = *states = 0;



	ret = get_cpu_info(&cpu_info);

	if (ret)

		return ret;



	if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_CPB) {

		*support = 1;
@@ -34,7 +29,7 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active, 
		 * has Hardware determined variable increments instead.

		 */



		if (cpu_info.family == 0x17 || cpu_info.family == 0x18) {

		if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_CPB_MSR) {

			if (!read_msr(cpu, MSR_AMD_HWCR, &val)) {

				if (!(val & CPUPOWER_AMD_CPBDIS))

					*active = 1;