[tip:x86/urgent] perf/x86/intel: Add Knights Mill CPUID

2016-10-17 Thread tip-bot for Piotr Luc 
Commit-ID:  608284bf0def3ca5e6936920fcd84294101ef12d
Gitweb: http://git.kernel.org/tip/608284bf0def3ca5e6936920fcd84294101ef12d
Author: Piotr Luc 
AuthorDate: Wed, 12 Oct 2016 20:26:34 +0200
Committer:  Ingo Molnar 
CommitDate: Mon, 17 Oct 2016 10:45:08 +0200

perf/x86/intel: Add Knights Mill CPUID

Add Knights Mill (KNM) to the list of CPUIDs supported by PMU.

Signed-off-by: Piotr Luc 
Reviewed-by: Dave Hansen 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Josh Poimboeuf 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/20161012182634.2462-1-piotr@intel.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/events/intel/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a3a9eb8..eab0915 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3898,6 +3898,7 @@ __init int intel_pmu_init(void)
break;
 
case INTEL_FAM6_XEON_PHI_KNL:
+   case INTEL_FAM6_XEON_PHI_KNM:
memcpy(hw_cache_event_ids,
   slm_hw_cache_event_ids, sizeof(hw_cache_event_ids));
memcpy(hw_cache_extra_regs,
@@ -3912,7 +3913,7 @@ __init int intel_pmu_init(void)
x86_pmu.flags |= PMU_FL_HAS_RSP_1;
x86_pmu.flags |= PMU_FL_NO_HT_SHARING;
 
-   pr_cont("Knights Landing events, ");
+   pr_cont("Knights Landing/Mill events, ");
break;
 
case INTEL_FAM6_SKYLAKE_MOBILE:

[tip:x86/urgent] perf/x86/intel: Add Knights Mill CPUID

2016-10-16 Thread tip-bot for Piotr Luc 
Commit-ID:  d673b8340cac02d02de30197d6fe66c22a1df6e4
Gitweb: http://git.kernel.org/tip/d673b8340cac02d02de30197d6fe66c22a1df6e4
Author: Piotr Luc 
AuthorDate: Wed, 12 Oct 2016 20:26:34 +0200
Committer:  Ingo Molnar 
CommitDate: Sun, 16 Oct 2016 11:32:11 +0200

perf/x86/intel: Add Knights Mill CPUID

Add Knights Mill (KNM) to the list of CPUIDs supported by PMU.

Signed-off-by: Piotr Luc 
Reviewed-by: Dave Hansen 
Cc: Andy Lutomirski 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Josh Poimboeuf 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Link: http://lkml.kernel.org/r/20161012182634.2462-1-piotr@intel.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/events/intel/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a3a9eb8..eab0915 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3898,6 +3898,7 @@ __init int intel_pmu_init(void)
break;
 
case INTEL_FAM6_XEON_PHI_KNL:
+   case INTEL_FAM6_XEON_PHI_KNM:
memcpy(hw_cache_event_ids,
   slm_hw_cache_event_ids, sizeof(hw_cache_event_ids));
memcpy(hw_cache_extra_regs,
@@ -3912,7 +3913,7 @@ __init int intel_pmu_init(void)
x86_pmu.flags |= PMU_FL_HAS_RSP_1;
x86_pmu.flags |= PMU_FL_NO_HT_SHARING;
 
-   pr_cont("Knights Landing events, ");
+   pr_cont("Knights Landing/Mill events, ");
break;
 
case INTEL_FAM6_SKYLAKE_MOBILE: