diff options
author | Andi Kleen <ak@linux.intel.com> | 2015-06-11 16:52:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-29 15:35:28 -0400 |
commit | 0432ca1ad0d399d40db32c4364143b1d741e18c5 (patch) | |
tree | a6b4df862dc70007146e62c6964e8896d2892637 /arch | |
parent | 12709f95fd8ca75ec1c4dbed945751b4d0d1d05f (diff) |
perf/x86: Add more Broadwell model numbers
commit 4b36f1a4139c9284df74c0f5d7655603d67807df upstream.
This patch adds additional model numbers for Broadwell to perf.
Support for Broadwell with Iris Pro (Intel Core i7-57xxC)
and support for Broadwell Server Xeon.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1434055942-28253-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index a1e35c9f06b9..afdd7c08d0fc 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
@@ -3253,6 +3253,8 @@ __init int intel_pmu_init(void) | |||
3253 | 3253 | ||
3254 | case 61: /* 14nm Broadwell Core-M */ | 3254 | case 61: /* 14nm Broadwell Core-M */ |
3255 | case 86: /* 14nm Broadwell Xeon D */ | 3255 | case 86: /* 14nm Broadwell Xeon D */ |
3256 | case 71: /* 14nm Broadwell + GT3e (Intel Iris Pro graphics) */ | ||
3257 | case 79: /* 14nm Broadwell Server */ | ||
3256 | x86_pmu.late_ack = true; | 3258 | x86_pmu.late_ack = true; |
3257 | memcpy(hw_cache_event_ids, hsw_hw_cache_event_ids, sizeof(hw_cache_event_ids)); | 3259 | memcpy(hw_cache_event_ids, hsw_hw_cache_event_ids, sizeof(hw_cache_event_ids)); |
3258 | memcpy(hw_cache_extra_regs, hsw_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); | 3260 | memcpy(hw_cache_extra_regs, hsw_hw_cache_extra_regs, sizeof(hw_cache_extra_regs)); |