Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fdda3c4a

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+6 −1
Original line number Diff line number Diff line
@@ -883,6 +883,9 @@ static int __init uncore_pci_init(void) 
	case 62: /* Ivy Bridge-EP */

		ret = ivbep_uncore_pci_init();

		break;

	case 63: /* Haswell-EP */

		ret = hswep_uncore_pci_init();

		break;

	case 42: /* Sandy Bridge */

		ret = snb_uncore_pci_init();

		break;
@@ -1190,7 +1193,9 @@ static int __init uncore_cpu_init(void) 
	case 62: /* Ivy Bridge-EP */

		ivbep_uncore_cpu_init();

		break;



	case 63: /* Haswell-EP */

		hswep_uncore_cpu_init();

		break;

	default:

		return 0;

	}

arch/x86/kernel/cpu/perf_event_intel_uncore.h

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ int snbep_uncore_pci_init(void); 
void snbep_uncore_cpu_init(void);

int ivbep_uncore_pci_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 */

void nhmex_uncore_cpu_init(void);

arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c

+607 −1

File changed.

Preview size limit exceeded, changes collapsed.