From: Nick Chan <towinchenmi@gmail.com>
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>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <maz@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org, devicetree@vger.kernel.org,
asahi@lists.linux.dev, linux-kernel@vger.kernel.org,
Nick Chan <towinchenmi@gmail.com>
Subject: [PATCH v4 06/11] drivers/perf: apple_m1: Support per-implementation event attr group
Date: Fri, 14 Feb 2025 22:28:32 +0800 [thread overview]
Message-ID: <20250214-apple-cpmu-v4-6-ffca0e45147e@gmail.com> (raw)
In-Reply-To: <20250214-apple-cpmu-v4-0-ffca0e45147e@gmail.com>
To support implementations with different event numbers for cycles or
instruction events, event attr groups needs to be per-implementation.
Signed-off-by: Nick Chan <towinchenmi@gmail.com>
---
drivers/perf/apple_m1_cpu_pmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c
index b601d585d204f9e59ad7f5216679b97852a46a04..f98f3e95bfdbb5e9d0fe66357f6037f056fbf25c 100644
--- a/drivers/perf/apple_m1_cpu_pmu.c
+++ b/drivers/perf/apple_m1_cpu_pmu.c
@@ -612,7 +612,6 @@ static int apple_pmu_init(struct arm_pmu *cpu_pmu, u32 counters)
cpu_pmu->set_event_filter = m1_pmu_set_event_filter;
bitmap_set(cpu_pmu->cntr_mask, 0, counters);
- 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 0;
}
@@ -625,6 +624,7 @@ static int m1_pmu_ice_init(struct arm_pmu *cpu_pmu)
cpu_pmu->map_event = m1_pmu_map_event;
cpu_pmu->reset = m1_pmu_reset;
cpu_pmu->start = m1_pmu_start;
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS);
}
@@ -635,6 +635,7 @@ static int m1_pmu_fire_init(struct arm_pmu *cpu_pmu)
cpu_pmu->map_event = m1_pmu_map_event;
cpu_pmu->reset = m1_pmu_reset;
cpu_pmu->start = m1_pmu_start;
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS);
}
@@ -645,6 +646,7 @@ static int m2_pmu_avalanche_init(struct arm_pmu *cpu_pmu)
cpu_pmu->map_event = m2_pmu_map_event;
cpu_pmu->reset = m1_pmu_reset;
cpu_pmu->start = m1_pmu_start;
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS);
}
@@ -655,6 +657,7 @@ static int m2_pmu_blizzard_init(struct arm_pmu *cpu_pmu)
cpu_pmu->map_event = m2_pmu_map_event;
cpu_pmu->reset = m1_pmu_reset;
cpu_pmu->start = m1_pmu_start;
+ cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group;
return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS);
}
--
2.48.1
next prev parent reply other threads:[~2025-02-14 14:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 14:28 [PATCH v4 00/11] drivers/perf: apple_m1: Add Apple A7-A11, T2 SoC support Nick Chan
2025-02-14 14:28 ` [PATCH v4 01/11] dt-bindings: arm: pmu: Add Apple A7-A11 SoC CPU PMU compatibles Nick Chan
2025-02-14 14:28 ` [PATCH v4 02/11] drivers/perf: apple_m1: Support per-implementation event tables Nick Chan
2025-02-14 14:28 ` [PATCH v4 03/11] drivers/perf: apple_m1: Support a per-implementation number of counters Nick Chan
2025-02-14 14:28 ` [PATCH v4 04/11] drivers/perf: apple_m1: Support configuring counters for 32-bit EL0 Nick Chan
2025-02-14 14:28 ` [PATCH v4 05/11] drivers/perf: apple_m1: Support per-implementation PMU startup Nick Chan
2025-02-14 14:28 ` Nick Chan [this message]
2025-02-14 14:28 ` [PATCH v4 07/11] drivers/perf: apple_m1: Add Apple A7 support Nick Chan
2025-02-14 14:28 ` [PATCH v4 08/11] drivers/perf: apple_m1: Add Apple A8/A8X support Nick Chan
2025-02-14 14:28 ` [PATCH v4 09/11] drivers/perf: apple_m1: Add A9/A9X support Nick Chan
2025-02-14 14:28 ` [PATCH v4 10/11] drivers/perf: apple_m1: Add Apple A10/A10X/T2 Support Nick Chan
2025-02-14 14:28 ` [PATCH v4 11/11] drivers/perf: apple_m1: Add Apple A11 Support Nick Chan
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=20250214-apple-cpmu-v4-6-ffca0e45147e@gmail.com \
--to=towinchenmi@gmail.com \
--cc=asahi@lists.linux.dev \
--cc=catalin.marinas@arm.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--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=robh@kernel.org \
--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