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

Commit cd34cd97 authored by Kan Liang's avatar Kan Liang Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Add Skylake server uncore support 



This patch implements the uncore monitoring driver for Skylake server.
The uncore subsystem in Skylake server is similar to previous
server. There are some differences in config register encoding and pci
device IDs. Besides, Skylake introduces many new boxes to reflect the
MESH architecture changes.

The control registers for IIO and UPI have been extended to 64 bit. This
patch also introduces event_mask_ext to handle the high 32 bit mask.

The CHA box number could vary for different machines. This patch gets
the CHA box number by counting the CHA register space during
initialization at runtime.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1471378190-17276-3-git-send-email-kan.liang@intel.com


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

arch/x86/events/intel/uncore.c

+8 −1
Original line number Diff line number Diff line
@@ -685,7 +685,8 @@ static int uncore_pmu_event_init(struct perf_event *event) 
		/* fixed counters have event field hardcoded to zero */

		hwc->config = 0ULL;

	} else {

		hwc->config = event->attr.config & pmu->type->event_mask;

		hwc->config = event->attr.config &

			      (pmu->type->event_mask | ((u64)pmu->type->event_mask_ext << 32));

		if (pmu->type->ops->hw_config) {

			ret = pmu->type->ops->hw_config(box, event);

			if (ret)
@@ -1323,6 +1324,11 @@ static const struct intel_uncore_init_fun skl_uncore_init __initconst = { 
	.pci_init = skl_uncore_pci_init,

};



static const struct intel_uncore_init_fun skx_uncore_init __initconst = {

	.cpu_init = skx_uncore_cpu_init,

	.pci_init = skx_uncore_pci_init,

};



static const struct x86_cpu_id intel_uncore_match[] __initconst = {

	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EP,	  nhm_uncore_init),

	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM,	  nhm_uncore_init),
@@ -1345,6 +1351,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = { 
	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL,	  knl_uncore_init),

	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP,skl_uncore_init),

	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_uncore_init),

	X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,      skx_uncore_init),

	{},

};

arch/x86/events/intel/uncore.h

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct intel_uncore_type { 
	unsigned perf_ctr;

	unsigned event_ctl;

	unsigned event_mask;

	unsigned event_mask_ext;

	unsigned fixed_ctr;

	unsigned fixed_ctl;

	unsigned box_ctl;
@@ -381,6 +382,8 @@ int bdx_uncore_pci_init(void); 
void bdx_uncore_cpu_init(void);

int knl_uncore_pci_init(void);

void knl_uncore_cpu_init(void);

int skx_uncore_pci_init(void);

void skx_uncore_cpu_init(void);



/* perf_event_intel_uncore_nhmex.c */

void nhmex_uncore_cpu_init(void);

arch/x86/events/intel/uncore_snbep.c

+589 −0

File changed.

Preview size limit exceeded, changes collapsed.