aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index a4fe9fa0e29a..b237abc27ce6 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -139,7 +139,7 @@
139#define IVBEP_CB0_MSR_PMON_BOX_FILTER_OPC (0x1ffULL << 52) 139#define IVBEP_CB0_MSR_PMON_BOX_FILTER_OPC (0x1ffULL << 52)
140#define IVBEP_CB0_MSR_PMON_BOX_FILTER_C6 (0x1ULL << 61) 140#define IVBEP_CB0_MSR_PMON_BOX_FILTER_C6 (0x1ULL << 61)
141#define IVBEP_CB0_MSR_PMON_BOX_FILTER_NC (0x1ULL << 62) 141#define IVBEP_CB0_MSR_PMON_BOX_FILTER_NC (0x1ULL << 62)
142#define IVBEP_CB0_MSR_PMON_BOX_FILTER_IOSC (0x1ULL << 63) 142#define IVBEP_CB0_MSR_PMON_BOX_FILTER_ISOC (0x1ULL << 63)
143 143
144/* IVBEP home agent */ 144/* IVBEP home agent */
145#define IVBEP_HA_PCI_PMON_CTL_Q_OCC_RST (1 << 16) 145#define IVBEP_HA_PCI_PMON_CTL_Q_OCC_RST (1 << 16)
@@ -1214,6 +1214,9 @@ static struct attribute *ivbep_uncore_cbox_formats_attr[] = {
1214 &format_attr_filter_state2.attr, 1214 &format_attr_filter_state2.attr,
1215 &format_attr_filter_nid2.attr, 1215 &format_attr_filter_nid2.attr,
1216 &format_attr_filter_opc2.attr, 1216 &format_attr_filter_opc2.attr,
1217 &format_attr_filter_nc.attr,
1218 &format_attr_filter_c6.attr,
1219 &format_attr_filter_isoc.attr,
1217 NULL, 1220 NULL,
1218}; 1221};
1219 1222
@@ -1350,8 +1353,12 @@ static u64 ivbep_cbox_filter_mask(int fields)
1350 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_STATE; 1353 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_STATE;
1351 if (fields & 0x8) 1354 if (fields & 0x8)
1352 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_NID; 1355 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_NID;
1353 if (fields & 0x10) 1356 if (fields & 0x10) {
1354 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_OPC; 1357 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_OPC;
1358 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_NC;
1359 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_C6;
1360 mask |= IVBEP_CB0_MSR_PMON_BOX_FILTER_ISOC;
1361 }
1355 1362
1356 return mask; 1363 return mask;
1357} 1364}