aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2016-12-01 01:35:38 -0500
committerLen Brown <len.brown@intel.com>2016-12-01 01:35:38 -0500
commit005c82d64d1aa49290a39573019f73b5088beeff (patch)
tree155c24e4c65833350d5e3b1e9ac5418c207b2620
parentddadb8adea76e6168c55850f2066e441880fb3d5 (diff)
tools/power turbostat: Support Knights Mill (KNM)
Original-author: Piotr Luc <piotr.luc@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--tools/power/x86/turbostat/turbostat.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 83d1fb9750aa..a54ca3775521 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2202,6 +2202,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
2202 pkg_cstate_limits = amt_pkg_cstate_limits; 2202 pkg_cstate_limits = amt_pkg_cstate_limits;
2203 break; 2203 break;
2204 case INTEL_FAM6_XEON_PHI_KNL: /* PHI */ 2204 case INTEL_FAM6_XEON_PHI_KNL: /* PHI */
2205 case INTEL_FAM6_XEON_PHI_KNM:
2205 pkg_cstate_limits = phi_pkg_cstate_limits; 2206 pkg_cstate_limits = phi_pkg_cstate_limits;
2206 break; 2207 break;
2207 case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */ 2208 case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
@@ -2228,6 +2229,7 @@ int has_nhm_turbo_ratio_limit(unsigned int family, unsigned int model)
2228 case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */ 2229 case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */
2229 case INTEL_FAM6_WESTMERE_EX: /* Westmere-EX Xeon - Eagleton */ 2230 case INTEL_FAM6_WESTMERE_EX: /* Westmere-EX Xeon - Eagleton */
2230 case INTEL_FAM6_XEON_PHI_KNL: /* PHI - Knights Landing (different MSR definition) */ 2231 case INTEL_FAM6_XEON_PHI_KNL: /* PHI - Knights Landing (different MSR definition) */
2232 case INTEL_FAM6_XEON_PHI_KNM:
2231 return 0; 2233 return 0;
2232 default: 2234 default:
2233 return 1; 2235 return 1;
@@ -2275,6 +2277,7 @@ int has_knl_turbo_ratio_limit(unsigned int family, unsigned int model)
2275 2277
2276 switch (model) { 2278 switch (model) {
2277 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2279 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */
2280 case INTEL_FAM6_XEON_PHI_KNM:
2278 return 1; 2281 return 1;
2279 default: 2282 default:
2280 return 0; 2283 return 0;
@@ -2305,6 +2308,7 @@ int has_config_tdp(unsigned int family, unsigned int model)
2305 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2308 case INTEL_FAM6_SKYLAKE_X: /* SKX */
2306 2309
2307 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2310 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */
2311 case INTEL_FAM6_XEON_PHI_KNM:
2308 return 1; 2312 return 1;
2309 default: 2313 default:
2310 return 0; 2314 return 0;
@@ -2606,6 +2610,7 @@ rapl_dram_energy_units_probe(int model, double rapl_energy_units)
2606 case INTEL_FAM6_BROADWELL_X: /* BDX */ 2610 case INTEL_FAM6_BROADWELL_X: /* BDX */
2607 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2611 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
2608 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2612 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
2613 case INTEL_FAM6_XEON_PHI_KNM:
2609 return (rapl_dram_energy_units = 15.3 / 1000000); 2614 return (rapl_dram_energy_units = 15.3 / 1000000);
2610 default: 2615 default:
2611 return (rapl_energy_units); 2616 return (rapl_energy_units);
@@ -2654,6 +2659,7 @@ void rapl_probe(unsigned int family, unsigned int model)
2654 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2659 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
2655 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2660 case INTEL_FAM6_SKYLAKE_X: /* SKX */
2656 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2661 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
2662 case INTEL_FAM6_XEON_PHI_KNM:
2657 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; 2663 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
2658 break; 2664 break;
2659 case INTEL_FAM6_SANDYBRIDGE_X: 2665 case INTEL_FAM6_SANDYBRIDGE_X:
@@ -3017,6 +3023,7 @@ int is_knl(unsigned int family, unsigned int model)
3017 return 0; 3023 return 0;
3018 switch (model) { 3024 switch (model) {
3019 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 3025 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
3026 case INTEL_FAM6_XEON_PHI_KNM:
3020 return 1; 3027 return 1;
3021 } 3028 }
3022 return 0; 3029 return 0;