aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorVince Weaver <vincent.weaver@maine.edu>2013-04-29 15:52:27 -0400
committerIngo Molnar <mingo@kernel.org>2013-04-30 04:56:45 -0400
commit9a6bc14350b130427725f33e371e86212fa56c85 (patch)
tree38cdf66ad5e9e018c3a40f915d4bd843d085f194 /arch/x86/kernel
parent80e217e9ca98a99d6ee95c8f4473b7ebf6d1b8ca (diff)
perf/x86/intel: Add support for IvyBridge model 58 Uncore
According to Intel Vol3b 18.9, the IvyBridge model 58 uncore is the same as that of SandyBridge. I've done some simple tests and with this patch things seem to work on my mac-mini. Signed-off-by: Vince Weaver <vincent.weaver@maine.edu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Stephane Eranian <eranian@gmail.com> Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1304291549320.15827@vincent-weaver-1.um.maine.edu Cc: <stable@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_uncore.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 0d5ec6d6d335..22ebaa89af10 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -2853,6 +2853,7 @@ static int __init uncore_cpu_init(void)
2853 msr_uncores = nhm_msr_uncores; 2853 msr_uncores = nhm_msr_uncores;
2854 break; 2854 break;
2855 case 42: /* Sandy Bridge */ 2855 case 42: /* Sandy Bridge */
2856 case 58: /* Ivy Bridge */
2856 if (snb_uncore_cbox.num_boxes > max_cores) 2857 if (snb_uncore_cbox.num_boxes > max_cores)
2857 snb_uncore_cbox.num_boxes = max_cores; 2858 snb_uncore_cbox.num_boxes = max_cores;
2858 msr_uncores = snb_msr_uncores; 2859 msr_uncores = snb_msr_uncores;