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

Commit 337397f3 authored by Stephane Eranian's avatar Stephane Eranian Committed by Thomas Gleixner
Browse files

perf/x86/uncore: Fix IVT/SNB-EP uncore CBOX NID filter table 



This patch updates the CBOX PMU filters mapping tables for SNB-EP
and IVT (model 45 and 62 respectively).

The NID umask always comes in addition to another umask.
When set, the NID filter is applied.

The current mapping tables were missing some code/umask
combinations to account for the NID umask. This patch
fixes that.

Cc: mingo@elte.hu
Cc: ak@linux.intel.com
Reviewed-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140219131018.GA24475@quad


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c9b08884

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -501,8 +501,11 @@ static struct extra_reg snbep_uncore_cbox_extra_regs[] = { 
	SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,

	SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,

				  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),

				  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4334, 0xffff, 0x6),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4534, 0xffff, 0x6),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4934, 0xffff, 0x6),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0x6),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0x6),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x8),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x8),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x8),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x8),
@@ -1178,10 +1181,15 @@ static struct extra_reg ivt_uncore_cbox_extra_regs[] = { 
	SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,

	SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,

				  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),

				  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),

	SNBEP_CBO_EVENT_EXTRA_REG(0x1031, 0x10ff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x1031, 0x10ff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x5134, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4334, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4534, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4934, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x2135, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x2135, 0xffff, 0x10),