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