| From foo@baz Sun Aug 26 09:13:00 CEST 2018 |
| From: Calvin Walton <calvin.walton@kepstin.ca> |
| Date: Fri, 27 Jul 2018 07:50:53 -0400 |
| Subject: tools/power turbostat: Read extended processor family from CPUID |
| |
| From: Calvin Walton <calvin.walton@kepstin.ca> |
| |
| [ Upstream commit 5aa3d1a20a233d4a5f1ec3d62da3f19d9afea682 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/power/x86/turbostat/turbostat.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/tools/power/x86/turbostat/turbostat.c |
| +++ b/tools/power/x86/turbostat/turbostat.c |
| @@ -4029,7 +4029,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) { |
