Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch b/queue-4.14/perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
new file mode 100644 (file)
index 0000000..28f6413
--- /dev/null
+++ b/queue-4.14/perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
@@ -0,0 +1,41 @@
+From a30a35bf56de3dc846e42074883a58d7b5487275 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 15 Nov 2021 12:03:32 +0300
+Subject: perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake
+ Server
+
+From: Alexander Antonov <alexander.antonov@linux.intel.com>
+
+[ Upstream commit e324234e0aa881b7841c7c713306403e12b069ff ]
+
+According Uncore Reference Manual: any of the CHA events may be filtered
+by Thread/Core-ID by using tid modifier in CHA Filter 0 Register.
+Update skx_cha_hw_config() to follow Uncore Guide.
+
+Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support")
+Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
+Link: https://lore.kernel.org/r/20211115090334.3789-2-alexander.antonov@linux.intel.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/events/intel/uncore_snbep.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index 6b66285c6cede..9cce6d9fec1f4 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3383,6 +3383,9 @@ static int skx_cha_hw_config(struct intel_uncore_box *box, struct perf_event *ev
+       struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+       struct extra_reg *er;
+       int idx = 0;
++      /* Any of the CHA events may be filtered by Thread/Core-ID.*/
++      if (event->hw.config & SNBEP_CBO_PMON_CTL_TID_EN)
++              idx = SKX_CHA_MSR_PMON_BOX_FILTER_TID;
+ 
+       for (er = skx_uncore_cha_extra_regs; er->msr; er++) {
+               if (er->event != (event->hw.config & er->config_mask))
+-- 
+2.33.0
+

diff --git a/queue-4.14/perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch b/queue-4.14/perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
new file mode 100644 (file)
index 0000000..ba1790a
--- /dev/null
+++ b/queue-4.14/perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch
@@ -0,0 +1,38 @@
+From 002e648a65cfe0ed8e56f7eee6a95ba3f3559382 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 15 Nov 2021 12:03:33 +0300
+Subject: perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server
+
+From: Alexander Antonov <alexander.antonov@linux.intel.com>
+
+[ Upstream commit 3866ae319c846a612109c008f43cba80b8c15e86 ]
+
+According to the latest uncore document, COMP_BUF_OCCUPANCY (0xd5) event
+can be collected on 2-3 counters. Update uncore IIO event constraints for
+Skylake Server.
+
+Fixes: cd34cd97b7b4 ("perf/x86/intel/uncore: Add Skylake server uncore support")
+Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
+Link: https://lore.kernel.org/r/20211115090334.3789-3-alexander.antonov@linux.intel.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/events/intel/uncore_snbep.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index 9cce6d9fec1f4..b039d416fef34 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3453,6 +3453,7 @@ static struct event_constraint skx_uncore_iio_constraints[] = {
+       UNCORE_EVENT_CONSTRAINT(0xc0, 0xc),
+       UNCORE_EVENT_CONSTRAINT(0xc5, 0xc),
+       UNCORE_EVENT_CONSTRAINT(0xd4, 0xc),
++      UNCORE_EVENT_CONSTRAINT(0xd5, 0xc),
+       EVENT_CONSTRAINT_END
+ };
+ 
+-- 
+2.33.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 9c4b40d150549b4f63434a39571d4d01a56c01d4..1b504fa0d3b64733f3395a4b64ae8c8dea94f49a 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -229,3 +229,5 @@ i40e-fix-null-ptr-dereference-on-vsi-filter-sync.patch
 nfc-reorganize-the-functions-in-nci_request.patch
 nfc-reorder-the-logic-in-nfc_-un-register_device.patch
 perf-bench-fix-two-memory-leaks-detected-with-asan.patch
+perf-x86-intel-uncore-fix-filter_tid-mask-for-cha-ev.patch
+perf-x86-intel-uncore-fix-iio-event-constraints-for-.patch