Commit e735b9db authored by Yan, Zheng's avatar Yan, Zheng Committed by Ingo Molnar

perf/x86/intel/uncore: Add Haswell-EP uncore support

The uncore subsystem in Haswell-EP is similar to Sandy/Ivy
Bridge-EP. There are some differences in config register
encoding and pci device IDs. The Haswell-EP uncore also
supports a few new events. Add the Haswell-EP driver to
the snbep split driver.
Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
[ Add missing break. Add imc events. Add cbox nc/isoc/c6. ]
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: eranian@google.com
Link: http://lkml.kernel.org/r/1409872109-31645-2-git-send-email-andi@firstfloor.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fdda3c4a
...@@ -883,6 +883,9 @@ static int __init uncore_pci_init(void) ...@@ -883,6 +883,9 @@ static int __init uncore_pci_init(void)
case 62: /* Ivy Bridge-EP */ case 62: /* Ivy Bridge-EP */
ret = ivbep_uncore_pci_init(); ret = ivbep_uncore_pci_init();
break; break;
case 63: /* Haswell-EP */
ret = hswep_uncore_pci_init();
break;
case 42: /* Sandy Bridge */ case 42: /* Sandy Bridge */
ret = snb_uncore_pci_init(); ret = snb_uncore_pci_init();
break; break;
...@@ -1190,7 +1193,9 @@ static int __init uncore_cpu_init(void) ...@@ -1190,7 +1193,9 @@ static int __init uncore_cpu_init(void)
case 62: /* Ivy Bridge-EP */ case 62: /* Ivy Bridge-EP */
ivbep_uncore_cpu_init(); ivbep_uncore_cpu_init();
break; break;
case 63: /* Haswell-EP */
hswep_uncore_cpu_init();
break;
default: default:
return 0; return 0;
} }
......
...@@ -332,6 +332,8 @@ int snbep_uncore_pci_init(void); ...@@ -332,6 +332,8 @@ int snbep_uncore_pci_init(void);
void snbep_uncore_cpu_init(void); void snbep_uncore_cpu_init(void);
int ivbep_uncore_pci_init(void); int ivbep_uncore_pci_init(void);
void ivbep_uncore_cpu_init(void); void ivbep_uncore_cpu_init(void);
int hswep_uncore_pci_init(void);
void hswep_uncore_cpu_init(void);
/* perf_event_intel_uncore_nhmex.c */ /* perf_event_intel_uncore_nhmex.c */
void nhmex_uncore_cpu_init(void); void nhmex_uncore_cpu_init(void);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment