linux-kernel - [PATCH v1] drivers/perf: apple_m1: fix affinity table for event 0x96 and 0x9b

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <tencent_7B71486CE305DF8AE084B6BB6313EE550C06@qq.com>
Date: Thu, 20 Jun 2024 11:04:28 +0800
From: Yangyu Chen <cyy@...self.name>
To: linux-arm-kernel@...ts.infradead.org
Cc: Marc Zyngier <maz@...nel.org>,
	Will Deacon <will@...nel.org>,
	Mark Rutland <mark.rutland@....com>,
	Janne Grunau <j@...nau.net>,
	Hector Martin <marcan@...can.st>,
	Asahi Lina <lina@...hilina.net>,
	asahi@...ts.linux.dev,
	linux-kernel@...r.kernel.org,
	Yangyu Chen <cyy@...self.name>
Subject: [PATCH v1] drivers/perf: apple_m1: fix affinity table for event 0x96 and 0x9b

Events 0x96 and 0x9b can be installed on counter 7 only. Fix this to avoid
getting the wrong counter value.

Signed-off-by: Yangyu Chen <cyy@...self.name>
---
 drivers/perf/apple_m1_cpu_pmu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c
index f322e5ca1114..b8127e5428e1 100644
--- a/drivers/perf/apple_m1_cpu_pmu.c
+++ b/drivers/perf/apple_m1_cpu_pmu.c
@@ -107,12 +107,12 @@ static const u16 m1_pmu_event_affinity[M1_PMU_PERFCTR_LAST + 1] = {
 	[M1_PMU_PERFCTR_UNKNOWN_93]	= ONLY_5_6_7,
 	[M1_PMU_PERFCTR_UNKNOWN_94]	= ONLY_5_6_7,
 	[M1_PMU_PERFCTR_UNKNOWN_95]	= ONLY_5_6_7,
-	[M1_PMU_PERFCTR_UNKNOWN_96]	= ONLY_5_6_7,
+	[M1_PMU_PERFCTR_UNKNOWN_96]	= BIT(7),
 	[M1_PMU_PERFCTR_UNKNOWN_97]	= BIT(7),
 	[M1_PMU_PERFCTR_UNKNOWN_98]	= ONLY_5_6_7,
 	[M1_PMU_PERFCTR_UNKNOWN_99]	= ONLY_5_6_7,
 	[M1_PMU_PERFCTR_UNKNOWN_9a]	= BIT(7),
-	[M1_PMU_PERFCTR_UNKNOWN_9b]	= ONLY_5_6_7,
+	[M1_PMU_PERFCTR_UNKNOWN_9b]	= BIT(7),
 	[M1_PMU_PERFCTR_UNKNOWN_9c]	= ONLY_5_6_7,
 	[M1_PMU_PERFCTR_UNKNOWN_9f]	= BIT(7),
 	[M1_PMU_PERFCTR_UNKNOWN_bf]	= ONLY_5_6_7,
-- 
2.45.1