Commit 32e8c616 authored by Zhang Rui's avatar Zhang Rui
Browse files

tools/power/turbostat: Improve probe_platform_features() logic 



AMD/Hygon platforms that don't have RAPL use 'amd_features' to describe
the platform features. Unknown Intel platforms use 'default_features' to
describe the platform features.

As none of the platform feature is set for 'amd_features' or
'default_features', there is no need to maintain both of them.

Remove 'amd_features' structure and improve the logic in
probe_platform_features().

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarLen Brown <len.brown@intel.com>
parent d085b3b0

tools/power/x86/turbostat/turbostat.c

+2 −7
Original line number Diff line number Diff line
@@ -767,9 +767,6 @@ static const struct platform_features knl_features = { 
static const struct platform_features default_features = {

};



static const struct platform_features amd_features = {

};



static const struct platform_features amd_features_with_rapl = {

	.rapl_msrs = RAPL_AMD_F17H,

	.has_per_core_rapl = 1,
@@ -849,9 +846,9 @@ void probe_platform_features(unsigned int family, unsigned int model) 
{

	int i;



	if (authentic_amd || hygon_genuine) {

		platform = &amd_features;

	platform = &default_features;



	if (authentic_amd || hygon_genuine) {

		if (max_extended_level >= 0x80000007) {

			unsigned int eax, ebx, ecx, edx;
@@ -863,8 +860,6 @@ void probe_platform_features(unsigned int family, unsigned int model) 
		return;

	}



	platform = &default_features;



	if (!genuine_intel || family != 6)

		return;