tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tools/power turbostat: Support Knights Mill (KNM)

Original-author: Piotr Luc <piotr.luc@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

Len Brown 005c82d6 ddadb8ad

+7
unified split
+7
tools/power/x86/turbostat/turbostat.c
··· 2202 pkg_cstate_limits = amt_pkg_cstate_limits; 2203 break; 2204 case INTEL_FAM6_XEON_PHI_KNL: /* PHI */ 2205 pkg_cstate_limits = phi_pkg_cstate_limits; 2206 break; 2207 case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */ ··· 2229 case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */ 2230 case INTEL_FAM6_WESTMERE_EX: /* Westmere-EX Xeon - Eagleton */ 2231 case INTEL_FAM6_XEON_PHI_KNL: /* PHI - Knights Landing (different MSR definition) */ 2232 return 0; 2233 default: 2234 return 1; ··· 2277 2278 switch (model) { 2279 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2280 return 1; 2281 default: 2282 return 0; ··· 2308 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2309 2310 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2311 return 1; 2312 default: 2313 return 0; ··· 2610 case INTEL_FAM6_BROADWELL_X: /* BDX */ 2611 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2612 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2613 return (rapl_dram_energy_units = 15.3 / 1000000); 2614 default: 2615 return (rapl_energy_units); ··· 2659 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2660 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2661 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2662 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; 2663 break; 2664 case INTEL_FAM6_SANDYBRIDGE_X: ··· 3023 return 0; 3024 switch (model) { 3025 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 3026 return 1; 3027 } 3028 return 0;
··· 2202 pkg_cstate_limits = amt_pkg_cstate_limits; 2203 break; 2204 case INTEL_FAM6_XEON_PHI_KNL: /* PHI */ 2205 + case INTEL_FAM6_XEON_PHI_KNM: 2206 pkg_cstate_limits = phi_pkg_cstate_limits; 2207 break; 2208 case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */ ··· 2228 case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */ 2229 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_KNM: 2232 return 0; 2233 default: 2234 return 1; ··· 2275 2276 switch (model) { 2277 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2278 + case INTEL_FAM6_XEON_PHI_KNM: 2279 return 1; 2280 default: 2281 return 0; ··· 2305 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2306 2307 case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */ 2308 + case INTEL_FAM6_XEON_PHI_KNM: 2309 return 1; 2310 default: 2311 return 0; ··· 2606 case INTEL_FAM6_BROADWELL_X: /* BDX */ 2607 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2608 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2609 + case INTEL_FAM6_XEON_PHI_KNM: 2610 return (rapl_dram_energy_units = 15.3 / 1000000); 2611 default: 2612 return (rapl_energy_units); ··· 2654 case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */ 2655 case INTEL_FAM6_SKYLAKE_X: /* SKX */ 2656 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 2657 + case INTEL_FAM6_XEON_PHI_KNM: 2658 do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; 2659 break; 2660 case INTEL_FAM6_SANDYBRIDGE_X: ··· 3017 return 0; 3018 switch (model) { 3019 case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ 3020 + case INTEL_FAM6_XEON_PHI_KNM: 3021 return 1; 3022 } 3023 return 0;