diff options
| author | Len Brown <len.brown@intel.com> | 2016-04-06 17:15:58 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-07 22:18:36 +0200 |
| commit | ec53e594c65ab099ca784d62b6f4c191e3a4d7cc (patch) | |
| tree | a8fc303d2e0930715a9e312ff59723e7ef04f8fc /tools | |
| parent | e8efbc80db5e824ce2382d5e65429b6b493e71e2 (diff) | |
| download | lwn-ec53e594c65ab099ca784d62b6f4c191e3a4d7cc.tar.gz lwn-ec53e594c65ab099ca784d62b6f4c191e3a4d7cc.zip | |
tools/power turbostat: initial SKX support
SKX has a lot in common with HSX
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index b15c84323b73..3b64b6bdaf90 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -2188,6 +2188,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) case 0x56: /* BDX-DE */ case 0x4E: /* SKL */ case 0x5E: /* SKL */ + case 0x55: /* SKX */ pkg_cstate_limits = hsw_pkg_cstate_limits; break; case 0x37: /* BYT */ @@ -2295,6 +2296,7 @@ int has_config_tdp(unsigned int family, unsigned int model) case 0x56: /* BDX-DE */ case 0x4E: /* SKL */ case 0x5E: /* SKL */ + case 0x55: /* SKX */ case 0x57: /* Knights Landing */ return 1; @@ -2642,6 +2644,7 @@ void rapl_probe(unsigned int family, unsigned int model) case 0x3F: /* HSX */ case 0x4F: /* BDX */ case 0x56: /* BDX-DE */ + case 0x55: /* SKX */ case 0x57: /* KNL */ do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; break; @@ -2921,6 +2924,7 @@ int has_snb_msrs(unsigned int family, unsigned int model) case 0x56: /* BDX-DE */ case 0x4E: /* SKL */ case 0x5E: /* SKL */ + case 0x55: /* SKX */ case 0x5C: /* BXT */ return 1; } @@ -3280,6 +3284,9 @@ void process_cpuid() case 0x5E: /* SKL */ crystal_hz = 24000000; /* 24.0 MHz */ break; + case 0x55: /* SKX */ + crystal_hz = 25000000; /* 25.0 MHz */ + break; case 0x5C: /* BXT */ crystal_hz = 19200000; /* 19.2 MHz */ break; @@ -3694,7 +3701,7 @@ int get_and_dump_counters(void) } void print_version() { - fprintf(outf, "turbostat version 4.11 27 Feb 2016" + fprintf(outf, "turbostat version 4.12 5 Apr 2016" " - Len Brown <lenb@kernel.org>\n"); } |