diff options
| author |  Zhang Rui <rui.zhang@intel.com>
| 2023-08-31 14:44:06 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com>
| 2023-09-27 22:14:20 +0800 |
| commit | 32e8c6169af7ef7c938b1bd996d27ab171e27d80 (patch) | |
| tree | 9bec9aa790ce75c563bd8830a000368e18f007da /tools/power | |
| parent | tools/power/turbostat: Delete intel_model_duplicates() (diff) | |
| download | linux-32e8c6169af7ef7c938b1bd996d27ab171e27d80.tar.gz linux-32e8c6169af7ef7c938b1bd996d27ab171e27d80.tar.bz2 linux-32e8c6169af7ef7c938b1bd996d27ab171e27d80.zip | |
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: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/power')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 89f53e1ac63a..102ba515cf4b 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -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; |