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

Commit 7711fe4f authored by Stephane Eranian's avatar Stephane Eranian Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Fix SNB-EP/IVT Cbox filter mappings 



This patch fixes the SNB-EP and IVT Cbox filter mapping
table. The table controls which filters are supported by
which events. There were several mistakes in those tables
causing some filters to be ignored, such as NID on
TOR_INSERTS.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: zheng.z.yan@intel.com
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20140630144624.GA2604@quad


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

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+6 −5
Original line number Diff line number Diff line
@@ -550,16 +550,16 @@ static struct extra_reg snbep_uncore_cbox_extra_regs[] = { 
	SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0x6),

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

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

	SNBEP_CBO_EVENT_EXTRA_REG(0x4135, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4335, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4135, 0xffff, 0xa),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4335, 0xffff, 0xa),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4435, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4835, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4a35, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x5035, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0136, 0xffff, 0x8),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0336, 0xffff, 0x8),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4136, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4336, 0xffff, 0xc),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4136, 0xffff, 0xa),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4336, 0xffff, 0xa),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4436, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4836, 0xffff, 0x2),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4a36, 0xffff, 0x2),
@@ -1222,6 +1222,7 @@ static struct extra_reg ivt_uncore_cbox_extra_regs[] = { 
	SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,

				  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),

	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),
@@ -1245,7 +1246,7 @@ static struct extra_reg ivt_uncore_cbox_extra_regs[] = { 
	SNBEP_CBO_EVENT_EXTRA_REG(0x8335, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0136, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x0336, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x2336, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x2136, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x2336, 0xffff, 0x10),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4136, 0xffff, 0x18),

	SNBEP_CBO_EVENT_EXTRA_REG(0x4336, 0xffff, 0x18),