[PATCH 5/6] perf/x86/uncore: fix SKX CHA event extra regs

[kan . liang]

From: Stephane Eranian 

This patch adds two missing event extra regs for Skylake Server CHA PMU:

 - TOR_INSERTS
 - TOR_OCCUPANCY

Were missing support for all the filters, including opcode matchers.

Signed-off-by: Stephane Eranian 
Signed-off-by: Kan Liang 
---
 arch/x86/events/intel/uncore_snbep.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/arch/x86/events/intel/uncore_snbep.c 
b/arch/x86/events/intel/uncore_snbep.c
index 2401d06..f9f825b 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3332,6 +3332,8 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = {
SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0x, 0x4),
SNBEP_CBO_EVENT_EXTRA_REG(0x3134, 0x, 0x4),
SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0x, 0x4),
+   SNBEP_CBO_EVENT_EXTRA_REG(0x35, 0xff, 0x8),
+   SNBEP_CBO_EVENT_EXTRA_REG(0x36, 0xff, 0x8),
 };
 
 static u64 skx_cha_filter_mask(int fields)
@@ -3344,6 +3346,17 @@ static u64 skx_cha_filter_mask(int fields)
mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LINK;
if (fields & 0x4)
mask |= SKX_CHA_MSR_PMON_BOX_FILTER_STATE;
+   if (fields & 0x8) {
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_REM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LOC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ALL_OPC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NOT_NM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC0;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC1;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ISOC;
+   }
return mask;
 }
 
-- 
2.7.4

[PATCH 5/6] perf/x86/uncore: fix SKX CHA event extra regs

[kan . liang]

From: Stephane Eranian 

This patch adds two missing event extra regs for Skylake Server CHA PMU:

 - TOR_INSERTS
 - TOR_OCCUPANCY

Were missing support for all the filters, including opcode matchers.

Signed-off-by: Stephane Eranian 
Signed-off-by: Kan Liang 
---
 arch/x86/events/intel/uncore_snbep.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/arch/x86/events/intel/uncore_snbep.c 
b/arch/x86/events/intel/uncore_snbep.c
index 2401d06..f9f825b 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3332,6 +3332,8 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = {
SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0x, 0x4),
SNBEP_CBO_EVENT_EXTRA_REG(0x3134, 0x, 0x4),
SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0x, 0x4),
+   SNBEP_CBO_EVENT_EXTRA_REG(0x35, 0xff, 0x8),
+   SNBEP_CBO_EVENT_EXTRA_REG(0x36, 0xff, 0x8),
 };
 
 static u64 skx_cha_filter_mask(int fields)
@@ -3344,6 +3346,17 @@ static u64 skx_cha_filter_mask(int fields)
mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LINK;
if (fields & 0x4)
mask |= SKX_CHA_MSR_PMON_BOX_FILTER_STATE;
+   if (fields & 0x8) {
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_REM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LOC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ALL_OPC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NOT_NM;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC0;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC1;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NC;
+   mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ISOC;
+   }
return mask;
 }
 
-- 
2.7.4