diff options
| author | Calvin Walton <calvin.walton@kepstin.ca> | 2018-07-27 13:50:53 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2018-07-27 18:54:19 +0200 |
| commit | 5aa3d1a20a233d4a5f1ec3d62da3f19d9afea682 (patch) | |
| tree | 1d88b4ecc77fc26eadf6966c901b03b995c6bff0 /tools/power/x86/turbostat | |
| parent | tools/power turbostat: Fix logical node enumeration to allow for non-sequenti... (diff) | |
| download | linux-5aa3d1a20a233d4a5f1ec3d62da3f19d9afea682.tar.xz linux-5aa3d1a20a233d4a5f1ec3d62da3f19d9afea682.zip | |
tools/power turbostat: Read extended processor family from CPUID
This fixes the reported family on modern AMD processors (e.g. Ryzen,
which is family 0x17). Previously these processors all showed up as
family 0xf.
See the document
https://support.amd.com/TechDocs/56255_OSRR.pdf
section CPUID_Fn00000001_EAX for how to calculate the family
from the BaseFamily and ExtFamily values.
This matches the code in arch/x86/lib/cpu.c
Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'tools/power/x86/turbostat')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 2b0135599f37..6c8effebf7c5 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4457,7 +4457,9 @@ void process_cpuid() family = (fms >> 8) & 0xf; model = (fms >> 4) & 0xf; stepping = fms & 0xf; - if (family == 6 || family == 0xf) + if (family == 0xf) + family += (fms >> 20) & 0xff; + if (family >= 6) model += ((fms >> 16) & 0xf) << 4; if (!quiet) { |