All of lore.kernel.org
 help / color / mirror / Atom feed
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 v4 09/10] drivers/perf: arm_pmu: Handle 47 bit counters
Date: Mon, 24 Jan 2022 20:12:30 +0000	[thread overview]
Message-ID: <20220124201231.298961-10-maz@kernel.org> (raw)
In-Reply-To: <20220124201231.298961-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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
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 v4 09/10] drivers/perf: arm_pmu: Handle 47 bit counters
Date: Mon, 24 Jan 2022 20:12:30 +0000	[thread overview]
Message-ID: <20220124201231.298961-10-maz@kernel.org> (raw)
In-Reply-To: <20220124201231.298961-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


  parent reply	other threads:[~2022-01-24 20:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-24 20:12 [PATCH v4 00/10] drivers/perf: CPU PMU driver for Apple M1 Marc Zyngier
2022-01-24 20:12 ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 01/10] dt-bindings: arm-pmu: Document Apple PMU compatible strings Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 02/10] dt-bindings: apple, aic: Add CPU PMU per-cpu pseudo-interrupts Marc Zyngier
2022-01-24 20:12   ` [PATCH v4 02/10] dt-bindings: apple,aic: " Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 03/10] dt-bindings: apple, aic: Add affinity description for " Marc Zyngier
2022-01-24 20:12   ` [PATCH v4 03/10] dt-bindings: apple,aic: " Marc Zyngier
2022-02-04 23:02   ` Rob Herring
2022-02-04 23:02     ` Rob Herring
2022-01-24 20:12 ` [PATCH v4 04/10] irqchip/apple-aic: Parse FIQ affinities from device-tree Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 05/10] irqchip/apple-aic: Wire PMU interrupts Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 06/10] arm64: dts: apple: Add t8103 PMU interrupt affinities Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 07/10] arm64: dts: apple: Add t8303 PMU nodes Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 08/10] irqchip/apple-aic: Move PMU-specific registers to their own include file Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier
2022-01-24 20:12 ` Marc Zyngier [this message]
2022-01-24 20:12   ` [PATCH v4 09/10] drivers/perf: arm_pmu: Handle 47 bit counters Marc Zyngier
2022-01-24 20:12 ` [PATCH v4 10/10] drivers/perf: Add Apple icestorm/firestorm CPU PMU driver Marc Zyngier
2022-01-24 20:12   ` Marc Zyngier

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=20220124201231.298961-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.