Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1500366 > unrolled thread
| Started by | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| First post | 2016-10-13 17:40 +0200 |
| Last post | 2016-10-24 18:20 +0200 |
| Articles | 10 — 4 participants |
Back to article view | Back to linux.kernel
[RESEND PATCH 00/11] Add Knights Mill CPU ID Piotr Luc <piotr.luc@intel.com> - 2016-10-13 17:40 +0200
[PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros Piotr Luc <piotr.luc@intel.com> - 2016-10-13 17:40 +0200
Re: [PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros Thomas Gleixner <tglx@linutronix.de> - 2016-10-14 14:10 +0200
Re: [PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros "Luc, Piotr" <Piotr.Luc@intel.com> - 2016-10-24 15:20 +0200
[RESEND PATCH 04/11] x86/intel_idle: Add Knights Mill CPUID Piotr Luc <piotr.luc@intel.com> - 2016-10-13 17:40 +0200
Re: [RESEND,04/11] x86/intel_idle: Add Knights Mill CPUID "Luc, Piotr" <Piotr.Luc@intel.com> - 2016-10-25 12:40 +0200
[RESEND PATCH 09/11] perf/x86/intel/uncore: Add Knights Mill CPUID Piotr Luc <piotr.luc@intel.com> - 2016-10-13 17:40 +0200
[RESEND PATCH 08/11] perf/x86/intel/rapl: Add Knights Mill CPUID Piotr Luc <piotr.luc@intel.com> - 2016-10-13 17:40 +0200
Re: [RESEND PATCH 00/11] Add Knights Mill CPU ID "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-10-14 00:00 +0200
Re: [RESEND PATCH 00/11] Add Knights Mill CPU ID "Luc, Piotr" <Piotr.Luc@intel.com> - 2016-10-24 18:20 +0200
| From | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| Date | 2016-10-13 17:40 +0200 |
| Subject | [RESEND PATCH 00/11] Add Knights Mill CPU ID |
| Message-ID | <srQgV-5jv-3@gated-at.bofh.it> |
Resending patches related to KNM CPU ID in one patchset for more convenient pick up. This series of patches enables support for Knights Mill (KNM). First two patches improve code style by replacing raw numbers of CPUID with descriptive macros of processor names. The third one introduces KNM CPU ID to Intel family. The other patches add KNM CPU ID to several modules and depend on the third one. Because KNM is closely related to Knights Landing (KNL) it reuses KNL code. The turbostat patch (tools/power turbostat: Use Intel family processor macros) comes in v2 with fixed compilation (missed including of intel-family.h). Regards, Piotr Piotr Luc (11): EDAC, sb_edac: Use Intel family processor macros tools/power turbostat: Use Intel family processor macros x86/cpu/intel: Add Knights Mill to Intel family x86/intel_idle: Add Knights Mill CPUID EDAC, sb_edac: Add Knights Mill CPUID cpufreq: intel_pstate: Add Knights Mill CPUID perf/x86/intel: Add Knights Mill CPUID perf/x86/intel/rapl: Add Knights Mill CPUID perf/x86/intel/uncore: Add Knights Mill CPUID powercap / RAPL: Add Knights Mill CPUID tools/power turbostat: enable turbostat to support Knights Mill (KNM) arch/x86/events/intel/core.c | 3 +- arch/x86/events/intel/rapl.c | 1 + arch/x86/events/intel/uncore.c | 1 + arch/x86/include/asm/intel-family.h | 1 + drivers/cpufreq/intel_pstate.c | 1 + drivers/edac/sb_edac.c | 14 +- drivers/idle/intel_idle.c | 1 + drivers/powercap/intel_rapl.c | 1 + tools/power/x86/turbostat/Makefile | 3 +- tools/power/x86/turbostat/turbostat.c | 250 ++++++++++++++++++---------------- 10 files changed, 147 insertions(+), 129 deletions(-) -- 2.10.1
[toc] | [next] | [standalone]
| From | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| Date | 2016-10-13 17:40 +0200 |
| Subject | [PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros |
| Message-ID | <srQgW-5jv-33@gated-at.bofh.it> |
| In reply to | #1500366 |
Use macros of Intel processor families instead of raw numbers.
Signed-off-by: Piotr Luc <piotr.luc@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: linux-kernel@vger.kernel.org
---
v2: Include Intel family header.
tools/power/x86/turbostat/Makefile | 3 +-
tools/power/x86/turbostat/turbostat.c | 243 +++++++++++++++++-----------------
2 files changed, 124 insertions(+), 122 deletions(-)
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index 8561e7d..20631f6 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -9,7 +9,8 @@ endif
turbostat : turbostat.c
CFLAGS += -Wall
-CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' \
+ -DFAMILYHEADER='"../../../../arch/x86/include/asm/intel-family.h"'
%: %.c
@mkdir -p $(BUILD_OUTPUT)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 3e199b5..09a542cc 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -21,6 +21,7 @@
#define _GNU_SOURCE
#include MSRHEADER
+#include FAMILYHEADER
#include <stdarg.h>
#include <stdio.h>
#include <err.h>
@@ -2174,47 +2175,47 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
bclk = discover_bclk(family, model);
switch (model) {
- case 0x1A: /* Core i7, Xeon 5500 series - Bloomfield, Gainstown NHM-EP */
- case 0x1E: /* Core i7 and i5 Processor - Clarksfield, Lynnfield, Jasper Forest */
- case 0x1F: /* Core i7 and i5 Processor - Nehalem */
- case 0x25: /* Westmere Client - Clarkdale, Arrandale */
- case 0x2C: /* Westmere EP - Gulftown */
- case 0x2E: /* Nehalem-EX Xeon - Beckton */
- case 0x2F: /* Westmere-EX Xeon - Eagleton */
+ case INTEL_FAM6_NEHALEM_EP: /* Core i7, Xeon 5500 series - Bloomfield, Gainstown NHM-EP */
+ case INTEL_FAM6_NEHALEM: /* Core i7 and i5 Processor - Clarksfield, Lynnfield, Jasper Forest */
+ case INTEL_FAM6_NEHALEM_G: /* Core i7 and i5 Processor - Nehalem */
+ case INTEL_FAM6_WESTMERE: /* Westmere Client - Clarkdale, Arrandale */
+ case INTEL_FAM6_WESTMERE_EP: /* Westmere EP - Gulftown */
+ case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */
+ case INTEL_FAM6_WESTMERE_EX: /* Westmere-EX Xeon - Eagleton */
pkg_cstate_limits = nhm_pkg_cstate_limits;
break;
- case 0x2A: /* SNB */
- case 0x2D: /* SNB Xeon */
- case 0x3A: /* IVB */
- case 0x3E: /* IVB Xeon */
+ case INTEL_FAM6_SANDYBRIDGE: /* SNB */
+ case INTEL_FAM6_SANDYBRIDGE_X: /* SNB Xeon */
+ case INTEL_FAM6_IVYBRIDGE: /* IVB */
+ case INTEL_FAM6_IVYBRIDGE_X: /* IVB Xeon */
pkg_cstate_limits = snb_pkg_cstate_limits;
break;
- case 0x3C: /* HSW */
- case 0x3F: /* HSX */
- case 0x45: /* HSW */
- case 0x46: /* HSW */
- case 0x3D: /* BDW */
- case 0x47: /* BDW */
- case 0x4F: /* BDX */
- case 0x56: /* BDX-DE */
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
- case 0x55: /* SKX */
+ case INTEL_FAM6_HASWELL_CORE: /* HSW */
+ case INTEL_FAM6_HASWELL_X: /* HSX */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_HASWELL_GT3E: /* HSW */
+ case INTEL_FAM6_BROADWELL_CORE: /* BDW */
+ case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
+ case INTEL_FAM6_BROADWELL_X: /* BDX */
+ case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
+ case INTEL_FAM6_SKYLAKE_X: /* SKX */
pkg_cstate_limits = hsw_pkg_cstate_limits;
break;
- case 0x37: /* BYT */
- case 0x4D: /* AVN */
+ case INTEL_FAM6_ATOM_SILVERMONT1: /* BYT */
+ case INTEL_FAM6_ATOM_SILVERMONT2: /* AVN */
pkg_cstate_limits = slv_pkg_cstate_limits;
break;
- case 0x4C: /* AMT */
+ case INTEL_FAM6_ATOM_AIRMONT: /* AMT */
pkg_cstate_limits = amt_pkg_cstate_limits;
break;
- case 0x57: /* PHI */
+ case INTEL_FAM6_XEON_PHI_KNL: /* PHI */
pkg_cstate_limits = phi_pkg_cstate_limits;
break;
- case 0x5C: /* BXT */
+ case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
pkg_cstate_limits = bxt_pkg_cstate_limits;
break;
default:
@@ -2234,9 +2235,9 @@ int has_nhm_turbo_ratio_limit(unsigned int family, unsigned int model)
{
switch (model) {
/* Nehalem compatible, but do not include turbo-ratio limit support */
- case 0x2E: /* Nehalem-EX Xeon - Beckton */
- case 0x2F: /* Westmere-EX Xeon - Eagleton */
- case 0x57: /* PHI - Knights Landing (different MSR definition) */
+ case INTEL_FAM6_NEHALEM_EX: /* Nehalem-EX Xeon - Beckton */
+ case INTEL_FAM6_WESTMERE_EX: /* Westmere-EX Xeon - Eagleton */
+ case INTEL_FAM6_XEON_PHI_KNL: /* PHI - Knights Landing (different MSR definition) */
return 0;
default:
return 1;
@@ -2251,8 +2252,8 @@ int has_ivt_turbo_ratio_limit(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x3E: /* IVB Xeon */
- case 0x3F: /* HSW Xeon */
+ case INTEL_FAM6_IVYBRIDGE_X: /* IVB Xeon */
+ case INTEL_FAM6_HASWELL_X: /* HSW Xeon */
return 1;
default:
return 0;
@@ -2267,7 +2268,7 @@ int has_hsw_turbo_ratio_limit(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x3F: /* HSW Xeon */
+ case INTEL_FAM6_HASWELL_X: /* HSW Xeon */
return 1;
default:
return 0;
@@ -2283,7 +2284,7 @@ int has_knl_turbo_ratio_limit(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x57: /* Knights Landing */
+ case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */
return 1;
default:
return 0;
@@ -2298,22 +2299,22 @@ int has_config_tdp(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x3A: /* IVB */
- case 0x3C: /* HSW */
- case 0x3F: /* HSX */
- case 0x45: /* HSW */
- case 0x46: /* HSW */
- case 0x3D: /* BDW */
- case 0x47: /* BDW */
- case 0x4F: /* BDX */
- case 0x56: /* BDX-DE */
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
- case 0x55: /* SKX */
-
- case 0x57: /* Knights Landing */
+ case INTEL_FAM6_IVYBRIDGE: /* IVB */
+ case INTEL_FAM6_HASWELL_CORE: /* HSW */
+ case INTEL_FAM6_HASWELL_X: /* HSX */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_HASWELL_GT3E: /* HSW */
+ case INTEL_FAM6_BROADWELL_CORE: /* BDW */
+ case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
+ case INTEL_FAM6_BROADWELL_X: /* BDX */
+ case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
+ case INTEL_FAM6_SKYLAKE_X: /* SKX */
+
+ case INTEL_FAM6_XEON_PHI_KNL: /* Knights Landing */
return 1;
default:
return 0;
@@ -2593,8 +2594,8 @@ double get_tdp(unsigned int model)
return ((msr >> 0) & RAPL_POWER_GRANULARITY) * rapl_power_units;
switch (model) {
- case 0x37:
- case 0x4D:
+ case INTEL_FAM6_ATOM_SILVERMONT1:
+ case INTEL_FAM6_ATOM_SILVERMONT2:
return 30.0;
default:
return 135.0;
@@ -2611,10 +2612,10 @@ rapl_dram_energy_units_probe(int model, double rapl_energy_units)
/* only called for genuine_intel, family 6 */
switch (model) {
- case 0x3F: /* HSX */
- case 0x4F: /* BDX */
- case 0x56: /* BDX-DE */
- case 0x57: /* KNL */
+ case INTEL_FAM6_HASWELL_X: /* HSX */
+ case INTEL_FAM6_BROADWELL_X: /* BDX */
+ case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
+ case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
return (rapl_dram_energy_units = 15.3 / 1000000);
default:
return (rapl_energy_units);
@@ -2640,37 +2641,37 @@ void rapl_probe(unsigned int family, unsigned int model)
return;
switch (model) {
- case 0x2A:
- case 0x3A:
- case 0x3C: /* HSW */
- case 0x45: /* HSW */
- case 0x46: /* HSW */
- case 0x3D: /* BDW */
- case 0x47: /* BDW */
+ case INTEL_FAM6_SANDYBRIDGE:
+ case INTEL_FAM6_IVYBRIDGE:
+ case INTEL_FAM6_HASWELL_CORE: /* HSW */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_HASWELL_GT3E: /* HSW */
+ case INTEL_FAM6_BROADWELL_CORE: /* BDW */
+ case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_GFX | RAPL_PKG_POWER_INFO;
break;
- case 0x5C: /* BXT */
+ case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
do_rapl = RAPL_PKG | RAPL_PKG_POWER_INFO;
break;
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
break;
- case 0x3F: /* HSX */
- case 0x4F: /* BDX */
- case 0x56: /* BDX-DE */
- case 0x55: /* SKX */
- case 0x57: /* KNL */
+ case INTEL_FAM6_HASWELL_X: /* HSX */
+ case INTEL_FAM6_BROADWELL_X: /* BDX */
+ case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
+ case INTEL_FAM6_SKYLAKE_X: /* SKX */
+ case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO;
break;
- case 0x2D:
- case 0x3E:
+ case INTEL_FAM6_SANDYBRIDGE_X:
+ case INTEL_FAM6_IVYBRIDGE_X:
do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_PKG_PERF_STATUS | RAPL_DRAM_PERF_STATUS | RAPL_PKG_POWER_INFO;
break;
- case 0x37: /* BYT */
- case 0x4D: /* AVN */
+ case INTEL_FAM6_ATOM_SILVERMONT1: /* BYT */
+ case INTEL_FAM6_ATOM_SILVERMONT2: /* AVN */
do_rapl = RAPL_PKG | RAPL_CORES ;
break;
default:
@@ -2713,11 +2714,11 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)
return;
switch (model) {
- case 0x3C: /* HSW */
- case 0x45: /* HSW */
- case 0x46: /* HSW */
+ case INTEL_FAM6_HASWELL_CORE: /* HSW */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_HASWELL_GT3E: /* HSW */
do_gfx_perf_limit_reasons = 1;
- case 0x3F: /* HSX */
+ case INTEL_FAM6_HASWELL_X: /* HSX */
do_core_perf_limit_reasons = 1;
do_ring_perf_limit_reasons = 1;
default:
@@ -2927,24 +2928,24 @@ int has_snb_msrs(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x2A:
- case 0x2D:
- case 0x3A: /* IVB */
- case 0x3E: /* IVB Xeon */
- case 0x3C: /* HSW */
- case 0x3F: /* HSW */
- case 0x45: /* HSW */
- case 0x46: /* HSW */
- case 0x3D: /* BDW */
- case 0x47: /* BDW */
- case 0x4F: /* BDX */
- case 0x56: /* BDX-DE */
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
- case 0x55: /* SKX */
- case 0x5C: /* BXT */
+ case INTEL_FAM6_SANDYBRIDGE:
+ case INTEL_FAM6_SANDYBRIDGE_X:
+ case INTEL_FAM6_IVYBRIDGE: /* IVB */
+ case INTEL_FAM6_IVYBRIDGE_X: /* IVB Xeon */
+ case INTEL_FAM6_HASWELL_CORE: /* HSW */
+ case INTEL_FAM6_HASWELL_X: /* HSW */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_HASWELL_GT3E: /* HSW */
+ case INTEL_FAM6_BROADWELL_CORE: /* BDW */
+ case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
+ case INTEL_FAM6_BROADWELL_X: /* BDX */
+ case INTEL_FAM6_BROADWELL_XEON_D: /* BDX-DE */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
+ case INTEL_FAM6_SKYLAKE_X: /* SKX */
+ case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
return 1;
}
return 0;
@@ -2968,13 +2969,13 @@ int has_hsw_msrs(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x45: /* HSW */
- case 0x3D: /* BDW */
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
- case 0x5C: /* BXT */
+ case INTEL_FAM6_HASWELL_ULT: /* HSW */
+ case INTEL_FAM6_BROADWELL_CORE: /* BDW */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
+ case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
return 1;
}
return 0;
@@ -2994,10 +2995,10 @@ int has_skl_msrs(unsigned int family, unsigned int model)
return 0;
switch (model) {
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
return 1;
}
return 0;
@@ -3010,8 +3011,8 @@ int is_slm(unsigned int family, unsigned int model)
if (!genuine_intel)
return 0;
switch (model) {
- case 0x37: /* BYT */
- case 0x4D: /* AVN */
+ case INTEL_FAM6_ATOM_SILVERMONT1: /* BYT */
+ case INTEL_FAM6_ATOM_SILVERMONT2: /* AVN */
return 1;
}
return 0;
@@ -3022,7 +3023,7 @@ int is_knl(unsigned int family, unsigned int model)
if (!genuine_intel)
return 0;
switch (model) {
- case 0x57: /* KNL */
+ case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
return 1;
}
return 0;
@@ -3303,16 +3304,16 @@ void process_cpuid()
if (crystal_hz == 0)
switch(model) {
- case 0x4E: /* SKL */
- case 0x5E: /* SKL */
- case 0x8E: /* KBL */
- case 0x9E: /* KBL */
+ case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+ case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */
+ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */
+ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */
crystal_hz = 24000000; /* 24.0 MHz */
break;
- case 0x55: /* SKX */
+ case INTEL_FAM6_SKYLAKE_X: /* SKX */
crystal_hz = 25000000; /* 25.0 MHz */
break;
- case 0x5C: /* BXT */
+ case INTEL_FAM6_ATOM_GOLDMONT: /* BXT */
crystal_hz = 19200000; /* 19.2 MHz */
break;
default:
--
2.10.1
[toc] | [prev] | [next] | [standalone]
| From | Thomas Gleixner <tglx@linutronix.de> |
|---|---|
| Date | 2016-10-14 14:10 +0200 |
| Subject | Re: [PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros |
| Message-ID | <ss9tg-15v-23@gated-at.bofh.it> |
| In reply to | #1500367 |
On Thu, 13 Oct 2016, Piotr Luc wrote: > + case INTEL_FAM6_NEHALEM_EP: /* Core i7, Xeon 5500 series - Bloomfield, Gainstown NHM-EP */ What's the point of keeping all those comments around? > + case INTEL_FAM6_SANDYBRIDGE: /* SNB */ Especialy those, which are completely useless? The defines are there to be self explaining and the extra verbose information should be in the header file defining the macros and not in the source code. Thanks, tglx
[toc] | [prev] | [next] | [standalone]
| From | "Luc, Piotr" <Piotr.Luc@intel.com> |
|---|---|
| Date | 2016-10-24 15:20 +0200 |
| Subject | Re: [PATCH v2 02/11] tools/power turbostat: Use Intel family processor macros |
| Message-ID | <svNkt-841-9@gated-at.bofh.it> |
| In reply to | #1500876 |
On Fri, 2016-10-14 at 13:56 +0200, Thomas Gleixner wrote: > On Thu, 13 Oct 2016, Piotr Luc wrote: > > > > + case INTEL_FAM6_SANDYBRIDGE: /* SNB */ > > Especialy those, which are completely useless? > > The defines are there to be self explaining and the extra verbose > information should be in the header file defining the macros and not > in the > source code. Hi I submitted the turbostat patchset https://lkml.kernel.org/r/20161018210652.29365-1-piotr.luc@intel.com to address the issues. Regards Piotr
[toc] | [prev] | [next] | [standalone]
| From | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| Date | 2016-10-13 17:40 +0200 |
| Subject | [RESEND PATCH 04/11] x86/intel_idle: Add Knights Mill CPUID |
| Message-ID | <srQgW-5jv-43@gated-at.bofh.it> |
| In reply to | #1500366 |
Add Knights Mill (KNM) to the list of CPUIDs supported by intel_idle.
Signed-off-by: Piotr Luc <piotr.luc@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: Len Brown <lenb@kernel.org>
Cc: linux-kernel@vger.kernel.org
---
This patch depends on [PATCH 03/11] x86/cpu/intel: Add Knights Mill
to Intel family
drivers/idle/intel_idle.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 67ec58f..69047a0 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -1084,6 +1084,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, idle_cpu_skl),
ICPU(INTEL_FAM6_SKYLAKE_X, idle_cpu_skx),
ICPU(INTEL_FAM6_XEON_PHI_KNL, idle_cpu_knl),
+ ICPU(INTEL_FAM6_XEON_PHI_KNM, idle_cpu_knl),
ICPU(INTEL_FAM6_ATOM_GOLDMONT, idle_cpu_bxt),
ICPU(INTEL_FAM6_ATOM_DENVERTON, idle_cpu_dnv),
{}
--
2.10.1
[toc] | [prev] | [next] | [standalone]
| From | "Luc, Piotr" <Piotr.Luc@intel.com> |
|---|---|
| Date | 2016-10-25 12:40 +0200 |
| Subject | Re: [RESEND,04/11] x86/intel_idle: Add Knights Mill CPUID |
| Message-ID | <sw7jc-4nV-23@gated-at.bofh.it> |
| In reply to | #1500368 |
Hi Len,
Could you tell me what more do I need to do to get the patchset
accepted?
The mentioned path 03/11 is already merged in 4.9.rc2.
Thanks,
Piotr
On Thu, 2016-10-13 at 17:30 +0200, Piotr Luc wrote:
> Add Knights Mill (KNM) to the list of CPUIDs supported by intel_idle.
>
> Signed-off-by: Piotr Luc <piotr.luc@intel.com>
> Reviewed-by: Dave Hansen <dave.hansen@intel.com>
> Cc: linux-pm@vger.kernel.org
> Cc: Len Brown <lenb@kernel.org>
> Cc: linux-kernel@vger.kernel.org
> ---
> This patch depends on [PATCH 03/11] x86/cpu/intel: Add Knights Mill
> to Intel family
>
> drivers/idle/intel_idle.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> index 67ec58f..69047a0 100644
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -1084,6 +1084,7 @@ static const struct x86_cpu_id intel_idle_ids[]
> __initconst = {
> ICPU(INTEL_FAM6_KABYLAKE_DESKTOP, idle_cpu_skl),
> ICPU(INTEL_FAM6_SKYLAKE_X, idle_cpu_skx),
> ICPU(INTEL_FAM6_XEON_PHI_KNL, idle_cpu_knl),
> + ICPU(INTEL_FAM6_XEON_PHI_KNM, idle_cpu_knl),
> ICPU(INTEL_FAM6_ATOM_GOLDMONT, idle_cpu_bxt),
> ICPU(INTEL_FAM6_ATOM_DENVERTON, idle_cpu_dnv)
> ,
> {}
[toc] | [prev] | [next] | [standalone]
| From | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| Date | 2016-10-13 17:40 +0200 |
| Subject | [RESEND PATCH 09/11] perf/x86/intel/uncore: Add Knights Mill CPUID |
| Message-ID | <srQgW-5jv-29@gated-at.bofh.it> |
| In reply to | #1500366 |
Add Knights Mill (KNM) to the list of CPUIDs supported by PMU.
Signed-off-by: Piotr Luc <piotr.luc@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
---
This patch depends on [PATCH 03/11] x86/cpu/intel: Add Knights Mill
to Intel family
arch/x86/events/intel/uncore.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 463dc7a..25acb30 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1341,6 +1341,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, bdx_uncore_init),
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, bdx_uncore_init),
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_uncore_init),
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP,skl_uncore_init),
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_uncore_init),
{},
--
2.10.1
[toc] | [prev] | [next] | [standalone]
| From | Piotr Luc <piotr.luc@intel.com> |
|---|---|
| Date | 2016-10-13 17:40 +0200 |
| Subject | [RESEND PATCH 08/11] perf/x86/intel/rapl: Add Knights Mill CPUID |
| Message-ID | <srQgW-5jv-39@gated-at.bofh.it> |
| In reply to | #1500366 |
Add Knights Mill (KNM) to the list of CPUIDs supported by rapl.
Signed-off-by: Piotr Luc <piotr.luc@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
---
This patch depends on [PATCH 03/11] x86/cpu/intel: Add Knights Mill
to Intel family
arch/x86/events/intel/rapl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 2886593..779e7c8 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -761,6 +761,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, hsw_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_rapl_init),
+ X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init),
--
2.10.1
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-10-14 00:00 +0200 |
| Message-ID | <srWcG-Ei-11@gated-at.bofh.it> |
| In reply to | #1500366 |
On Thursday, October 13, 2016 05:30:54 PM Piotr Luc wrote: > Resending patches related to KNM CPU ID in one patchset for > more convenient pick up. > > This series of patches enables support for Knights Mill (KNM). > > First two patches improve code style by replacing raw numbers > of CPUID with descriptive macros of processor names. > > The third one introduces KNM CPU ID to Intel family. > > The other patches add KNM CPU ID to several modules and depend on > the third one. Because KNM is closely related to Knights Landing (KNL) > it reuses KNL code. > The turbostat patch (tools/power turbostat: Use Intel family processor > macros) comes in v2 with fixed compilation (missed including of > intel-family.h). > > Regards, > Piotr > > Piotr Luc (11): > EDAC, sb_edac: Use Intel family processor macros > tools/power turbostat: Use Intel family processor macros > x86/cpu/intel: Add Knights Mill to Intel family > x86/intel_idle: Add Knights Mill CPUID > EDAC, sb_edac: Add Knights Mill CPUID > cpufreq: intel_pstate: Add Knights Mill CPUID > perf/x86/intel: Add Knights Mill CPUID > perf/x86/intel/rapl: Add Knights Mill CPUID > perf/x86/intel/uncore: Add Knights Mill CPUID > powercap / RAPL: Add Knights Mill CPUID > tools/power turbostat: enable turbostat to support Knights Mill (KNM) > > arch/x86/events/intel/core.c | 3 +- > arch/x86/events/intel/rapl.c | 1 + > arch/x86/events/intel/uncore.c | 1 + > arch/x86/include/asm/intel-family.h | 1 + > drivers/cpufreq/intel_pstate.c | 1 + > drivers/edac/sb_edac.c | 14 +- > drivers/idle/intel_idle.c | 1 + > drivers/powercap/intel_rapl.c | 1 + > tools/power/x86/turbostat/Makefile | 3 +- > tools/power/x86/turbostat/turbostat.c | 250 ++++++++++++++++++---------------- > 10 files changed, 147 insertions(+), 129 deletions(-) Len, Jacob, any problems with any of the patches in this series? Thanks, Rafael
[toc] | [prev] | [next] | [standalone]
| From | "Luc, Piotr" <Piotr.Luc@intel.com> |
|---|---|
| Date | 2016-10-24 18:20 +0200 |
| Message-ID | <svQ8F-1zn-17@gated-at.bofh.it> |
| In reply to | #1500600 |
On Thu, 2016-10-13 at 23:56 +0200, Rafael J. Wysocki wrote: > On Thursday, October 13, 2016 05:30:54 PM Piotr Luc wrote: > > > > Piotr Luc (11): > > EDAC, sb_edac: Use Intel family processor macros > > tools/power turbostat: Use Intel family processor macros > > x86/cpu/intel: Add Knights Mill to Intel family > > x86/intel_idle: Add Knights Mill CPUID > > EDAC, sb_edac: Add Knights Mill CPUID > > cpufreq: intel_pstate: Add Knights Mill CPUID > > perf/x86/intel: Add Knights Mill CPUID > > perf/x86/intel/rapl: Add Knights Mill CPUID > > perf/x86/intel/uncore: Add Knights Mill CPUID > > powercap / RAPL: Add Knights Mill CPUID > > tools/power turbostat: enable turbostat to support Knights Mill > > (KNM) > > > > arch/x86/events/intel/core.c | 3 +- > > arch/x86/events/intel/rapl.c | 1 + > > arch/x86/events/intel/uncore.c | 1 + > > arch/x86/include/asm/intel-family.h | 1 + > > drivers/cpufreq/intel_pstate.c | 1 + > > drivers/edac/sb_edac.c | 14 +- > > drivers/idle/intel_idle.c | 1 + > > drivers/powercap/intel_rapl.c | 1 + > > tools/power/x86/turbostat/Makefile | 3 +- > > tools/power/x86/turbostat/turbostat.c | 250 ++++++++++++++++++-- > > -------------- > > 10 files changed, 147 insertions(+), 129 deletions(-) > > Len, Jacob, any problems with any of the patches in this series? > > Thanks, > Rafael Hi I wonder if you could share with me what I need to do more to make the patches be accepted? Do I need to resend the ones that aren't accepted yet? Regards, Piotr
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web