From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Will Deacon <will@kernel.org>, Hector Martin <marcan@marcan.st>,
Sven Peter <sven@svenpeter.dev>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Rob Herring <robh+dt@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Dougall <dougallj@gmail.com>,
kernel-team@android.com
Subject: [PATCH v5 09/10] drivers/perf: arm_pmu: Handle 47 bit counters
Date: Tue, 8 Feb 2022 18:56:03 +0000 [thread overview]
Message-ID: <20220208185604.1097957-10-maz@kernel.org> (raw)
In-Reply-To: <20220208185604.1097957-1-maz@kernel.org>
The current ARM PMU framework can only deal with 32 or 64bit counters.
Teach it about a 47bit flavour.
Yes, this is odd.
Reviewed-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/perf/arm_pmu.c | 2 ++
include/linux/perf/arm_pmu.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 295cc7952d0e..0a9ed1a061ac 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -109,6 +109,8 @@ static inline u64 arm_pmu_event_max_period(struct perf_event *event)
{
if (event->hw.flags & ARMPMU_EVT_64BIT)
return GENMASK_ULL(63, 0);
+ else if (event->hw.flags & ARMPMU_EVT_47BIT)
+ return GENMASK_ULL(46, 0);
else
return GENMASK_ULL(31, 0);
}
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 2512e2f9cd4e..0407a38b470a 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -26,6 +26,8 @@
*/
/* Event uses a 64bit counter */
#define ARMPMU_EVT_64BIT 1
+/* Event uses a 47bit counter */
+#define ARMPMU_EVT_47BIT 2
#define HW_OP_UNSUPPORTED 0xFFFF
#define C(_x) PERF_COUNT_HW_CACHE_##_x
--
2.30.2
next prev parent reply other threads:[~2022-02-08 18:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-08 18:55 [PATCH v5 00/10] drivers/perf: CPU PMU driver for Apple M1 Marc Zyngier
2022-02-08 18:55 ` [PATCH v5 01/10] dt-bindings: arm-pmu: Document Apple PMU compatible strings Marc Zyngier
2022-02-08 18:55 ` [PATCH v5 02/10] dt-bindings: apple,aic: Add CPU PMU per-cpu pseudo-interrupts Marc Zyngier
2022-02-08 18:55 ` [PATCH v5 03/10] dt-bindings: apple,aic: Add affinity description for " Marc Zyngier
2022-02-08 18:55 ` [PATCH v5 04/10] irqchip/apple-aic: Parse FIQ affinities from device-tree Marc Zyngier
2022-02-08 18:55 ` [PATCH v5 05/10] irqchip/apple-aic: Wire PMU interrupts Marc Zyngier
2022-02-08 18:56 ` [PATCH v5 06/10] arm64: dts: apple: Add t8103 PMU interrupt affinities Marc Zyngier
2022-02-08 18:56 ` [PATCH v5 07/10] arm64: dts: apple: Add t8303 PMU nodes Marc Zyngier
2022-02-08 18:56 ` [PATCH v5 08/10] irqchip/apple-aic: Move PMU-specific registers to their own include file Marc Zyngier
2022-02-08 18:56 ` Marc Zyngier [this message]
2022-02-08 18:56 ` [PATCH v5 10/10] drivers/perf: Add Apple icestorm/firestorm CPU PMU driver Marc Zyngier
2022-03-07 15:55 ` [PATCH v5 00/10] drivers/perf: CPU PMU driver for Apple M1 Marc Zyngier
2022-03-08 14:10 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220208185604.1097957-10-maz@kernel.org \
--to=maz@kernel.org \
--cc=alyssa@rosenzweig.io \
--cc=devicetree@vger.kernel.org \
--cc=dougallj@gmail.com \
--cc=kernel-team@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sven@svenpeter.dev \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).