From: Myria Sarvay via B4 Relay <devnull+myrialsarvay.gmail.com@kernel.org>
To: Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Sven Peter <sven@kernel.org>,
Janne Grunau <j@jannau.net>, Neal Gompa <neal@gompa.dev>,
Marc Zyngier <maz@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, asahi@lists.linux.dev,
Yuvan Shen <yuvanshen09@gmail.com>,
Myria Sarvay <myrialsarvay@gmail.com>
Subject: [PATCH v2 05/15] drivers/perf: apple_m1: Use macros for per-implementation init functions
Date: Sat, 07 Nov 2026 21:48:52 +1100 [thread overview]
Message-ID: <20261107-m3-plus-pmu-events-v2-5-acf1e78da039@gmail.com> (raw)
In-Reply-To: <20261107-m3-plus-pmu-events-v2-0-acf1e78da039@gmail.com>
From: Myria Sarvay <myrialsarvay@gmail.com>
6 generations of apple silicon, with at least 2 init functions for each
lead to at least 12 init functions. Template them with macros to save
boilterplate code.
Signed-off-by: Myria Sarvay <myrialsarvay@gmail.com>
---
drivers/perf/apple_m1_cpu_pmu.c | 90 +++++++++++++----------------------------
1 file changed, 29 insertions(+), 61 deletions(-)
diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c
index a14864263bf1..a47605b159d6 100644
--- a/drivers/perf/apple_m1_cpu_pmu.c
+++ b/drivers/perf/apple_m1_cpu_pmu.c
@@ -653,71 +653,39 @@ static int apple_pmu_init(struct arm_pmu *cpu_pmu)
}
/* Device driver gunk */
-static int m1_pmu_ice_init(struct arm_pmu *cpu_pmu)
-{
- cpu_pmu->name = "apple_icestorm_pmu";
- cpu_pmu->enable = m1_pmu_enable_event;
- cpu_pmu->get_event_idx = m1_pmu_get_event_idx;
- cpu_pmu->map_event = m1_pmu_map_event;
- cpu_pmu->set_event_filter = m1_pmu_set_event_filter;
-
- cpu_pmu->map_pmuv3_event = m1_pmu_map_pmuv3_event;
-
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] = &m1_pmu_format_attr_group;
- return apple_pmu_init(cpu_pmu);
-}
-
-static int m1_pmu_fire_init(struct arm_pmu *cpu_pmu)
-{
- cpu_pmu->name = "apple_firestorm_pmu";
- cpu_pmu->enable = m1_pmu_enable_event;
- cpu_pmu->get_event_idx = m1_pmu_get_event_idx;
- cpu_pmu->map_event = m1_pmu_map_event;
- cpu_pmu->set_event_filter = m1_pmu_set_event_filter;
-
- cpu_pmu->map_pmuv3_event = m1_pmu_map_pmuv3_event;
-
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] = &m1_pmu_format_attr_group;
- return apple_pmu_init(cpu_pmu);
-}
-
-static int m2_pmu_avalanche_init(struct arm_pmu *cpu_pmu)
-{
- cpu_pmu->name = "apple_avalanche_pmu";
- cpu_pmu->enable = m1_pmu_enable_event;
- cpu_pmu->get_event_idx = m1_pmu_get_event_idx;
- cpu_pmu->map_event = m2_pmu_map_event;
- cpu_pmu->set_event_filter = m1_pmu_set_event_filter;
-
- cpu_pmu->map_pmuv3_event = m1_pmu_map_pmuv3_event;
-
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] = &m1_pmu_format_attr_group;
- return apple_pmu_init(cpu_pmu);
-}
-
-static int m2_pmu_blizzard_init(struct arm_pmu *cpu_pmu)
-{
- cpu_pmu->name = "apple_blizzard_pmu";
- cpu_pmu->enable = m1_pmu_enable_event;
- cpu_pmu->get_event_idx = m1_pmu_get_event_idx;
- cpu_pmu->map_event = m2_pmu_map_event;
- cpu_pmu->set_event_filter = m1_pmu_set_event_filter;
-
- cpu_pmu->map_pmuv3_event = m1_pmu_map_pmuv3_event;
-
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
- cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] = &m1_pmu_format_attr_group;
- return apple_pmu_init(cpu_pmu);
-}
+#define APPLE_PMU_INIT(gen, family) \
+static int gen ## _pmu_ ## family ## _init(struct arm_pmu *cpu_pmu) \
+{ \
+ cpu_pmu->name = "apple_" #family "_pmu"; \
+ cpu_pmu->enable = gen ## _pmu_enable_event; \
+ cpu_pmu->get_event_idx = gen ## _pmu_get_event_idx; \
+ cpu_pmu->map_event = gen ## _pmu_map_event; \
+ cpu_pmu->set_event_filter = gen ## _pmu_set_event_filter; \
+ \
+ cpu_pmu->map_pmuv3_event = gen ## _pmu_map_pmuv3_event; \
+ \
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &gen ## _pmu_events_attr_group; \
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] = &gen ## _pmu_format_attr_group; \
+ return apple_pmu_init(cpu_pmu); \
+}
+
+#define m2_pmu_enable_event m1_pmu_enable_event
+#define m2_pmu_get_event_idx m1_pmu_get_event_idx
+#define m2_pmu_set_event_filter m1_pmu_set_event_filter
+#define m2_pmu_map_pmuv3_event m1_pmu_map_pmuv3_event
+#define m2_pmu_events_attr_group m1_pmu_events_attr_group
+#define m2_pmu_format_attr_group m1_pmu_format_attr_group
+
+APPLE_PMU_INIT(m1, icestorm)
+APPLE_PMU_INIT(m1, firestorm)
+APPLE_PMU_INIT(m2, avalanche)
+APPLE_PMU_INIT(m2, blizzard)
static const struct of_device_id m1_pmu_of_device_ids[] = {
{ .compatible = "apple,avalanche-pmu", .data = m2_pmu_avalanche_init, },
{ .compatible = "apple,blizzard-pmu", .data = m2_pmu_blizzard_init, },
- { .compatible = "apple,icestorm-pmu", .data = m1_pmu_ice_init, },
- { .compatible = "apple,firestorm-pmu", .data = m1_pmu_fire_init, },
+ { .compatible = "apple,icestorm-pmu", .data = m1_pmu_icestorm_init, },
+ { .compatible = "apple,firestorm-pmu", .data = m1_pmu_firestorm_init, },
{ },
};
MODULE_DEVICE_TABLE(of, m1_pmu_of_device_ids);
--
2.55.0
next prev parent reply other threads:[~2026-11-07 10:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-07 10:48 [PATCH v2 00/15] drivers/perf: apple_m1: Add M3/M4/A18 Pro Support Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 01/15] dt-bindings: arm: pmu: Add Apple M3/M4/A18 Pro SoC CPU PMU compatibles Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 02/15] drivers/perf: apple_m1: Remove unused variables Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 03/15] drivers/perf: apple_m1: Support per-implementation event tables Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 04/15] drivers/perf: apple_m1: Support per-implementation event size Myria Sarvay via B4 Relay
2026-11-07 10:48 ` Myria Sarvay via B4 Relay [this message]
2026-11-07 10:48 ` [PATCH v2 06/15] drivers/perf: apple_m1: Add Apple M3 Series Support Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 07/15] drivers/perf: apple_m1: Add Apple M4 " Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 08/15] drivers/perf: apple_m1: Add Apple A18 Support Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 09/15] arm64: dts: apple: t603*: Add core interrupt affinities Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 10/15] arm64: dts: apple: t8140: " Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 11/15] arm64: dts: apple: t603x: Add PMU Device Nodes Myria Sarvay via B4 Relay
2026-11-07 10:48 ` [PATCH v2 12/15] arm64: dts: apple: t8122: " Myria Sarvay via B4 Relay
2026-11-07 10:49 ` [PATCH v2 13/15] arm64: dts: apple: t604x: " Myria Sarvay via B4 Relay
2026-11-07 10:49 ` [PATCH v2 14/15] arm64: dts: apple: t8132: " Myria Sarvay via B4 Relay
2026-11-07 10:49 ` [PATCH v2 15/15] arm64: dts: apple: t8140: " Myria Sarvay via B4 Relay
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=20261107-m3-plus-pmu-events-v2-5-acf1e78da039@gmail.com \
--to=devnull+myrialsarvay.gmail.com@kernel.org \
--cc=asahi@lists.linux.dev \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=j@jannau.net \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=myrialsarvay@gmail.com \
--cc=neal@gompa.dev \
--cc=robh@kernel.org \
--cc=sven@kernel.org \
--cc=will@kernel.org \
--cc=yuvanshen09@gmail.com \
/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
all inboxes | Powered by JetHome®