From nobody Fri Sep 12 02:28:50 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC553C05027 for ; Tue, 14 Feb 2023 10:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232573AbjBNKiL (ORCPT ); Tue, 14 Feb 2023 05:38:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232006AbjBNKiH (ORCPT ); Tue, 14 Feb 2023 05:38:07 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EEE4244B4; Tue, 14 Feb 2023 02:38:06 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 9A0FD26F78E; Tue, 14 Feb 2023 11:38:04 +0100 (CET) From: Janne Grunau Date: Tue, 14 Feb 2023 11:38:01 +0100 Subject: [PATCH 1/2] dt-bindings: arm-pmu: Add PMU compatible strings for Apple M2 cores MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-apple_m2_pmu-v1-1-9c9213ab9b63@jannau.net> References: <20230214-apple_m2_pmu-v1-0-9c9213ab9b63@jannau.net> In-Reply-To: <20230214-apple_m2_pmu-v1-0-9c9213ab9b63@jannau.net> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1019; i=j@jannau.net; h=from:subject:message-id; bh=EYGIdWeuF83XYijlj0mM1HCyJqYwvwRd2MoetNSkaJo=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuTXKd3G5SYdpuH7vhpzqv5Jfuy10FUvlcnS57TMpRVZl h0ZOxd3lLIwiHEwyIopsiRpv+xgWF2jGFP7IAxmDisTyBAGLk4BmMg/Loa/goJbnhl82Ft7dlrx rWdslX9TK27cqrLQfnM4ZJ/f8QuyCgx/JVjn1GUfSZ2SvyX87Cyf6xFX/t85+Hiq+0l+R3tTBvc DzAA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PMUs on the Apple M2 cores avalanche and blizzard CPU are compatible with M1 ones. As on M1 we don't know exactly what the counters count so use a distinct compatible for each micro-architecture. Apple's PMU counter description omits a counter for M2 so there is some variation on the interpretation of the counters. Signed-off-by: Janne Grunau Acked-by: Rob Herring Reviewed-by: Hector Martin --- Documentation/devicetree/bindings/arm/pmu.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/pmu.yaml b/Documentation= /devicetree/bindings/arm/pmu.yaml index dbb6f3dc5ae5..e14358bf0b9c 100644 --- a/Documentation/devicetree/bindings/arm/pmu.yaml +++ b/Documentation/devicetree/bindings/arm/pmu.yaml @@ -20,6 +20,8 @@ properties: items: - enum: - apm,potenza-pmu + - apple,avalanche-pmu + - apple,blizzard-pmu - apple,firestorm-pmu - apple,icestorm-pmu - arm,armv8-pmuv3 # Only for s/w models --=20 2.39.1 From nobody Fri Sep 12 02:28:50 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19356C05027 for ; Tue, 14 Feb 2023 10:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231683AbjBNKiO (ORCPT ); Tue, 14 Feb 2023 05:38:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232227AbjBNKiH (ORCPT ); Tue, 14 Feb 2023 05:38:07 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 611E7244B5; Tue, 14 Feb 2023 02:38:06 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 0042726F78F; Tue, 14 Feb 2023 11:38:04 +0100 (CET) From: Janne Grunau Date: Tue, 14 Feb 2023 11:38:02 +0100 Subject: [PATCH 2/2] drivers/perf: apple_m1: Add Apple M2 support MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230214-apple_m2_pmu-v1-2-9c9213ab9b63@jannau.net> References: <20230214-apple_m2_pmu-v1-0-9c9213ab9b63@jannau.net> In-Reply-To: <20230214-apple_m2_pmu-v1-0-9c9213ab9b63@jannau.net> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1281; i=j@jannau.net; h=from:subject:message-id; bh=UMxgpqVWtk29npa6KJJnZpE9eIozX2KpguZSAOm57YE=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuTXKd0V6YlpMx5ZS1za/J2TybBv8/IZ/xO8yu+qKthMO 5/z47NzRykLgxgHg6yYIkuS9ssOhtU1ijG1D8Jg5rAygQxh4OIUgImcO87wT1v91wGnWYb/d9X0 qDeWGJ62mNSfZ5hqGqujuqg5/t22Rwz/tL5vz/9UH3tqX/Uv6V1iB3f9e1zmYfH35T2r+mJ+0ba LrAA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PMU itself is compatible with the one found on M1. We still know next to nothing about the counters so keep using CPU uarch specific compatibles/PMU names. Signed-off-by: Janne Grunau Acked-by: Mark Rutland --- drivers/perf/apple_m1_cpu_pmu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pm= u.c index 979a7c2b4f56..83b74c7fe63f 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -559,7 +559,21 @@ static int m1_pmu_fire_init(struct arm_pmu *cpu_pmu) return m1_pmu_init(cpu_pmu); } =20 +static int m2_pmu_avalanche_init(struct arm_pmu *cpu_pmu) +{ + cpu_pmu->name =3D "apple_avalanche_pmu"; + return m1_pmu_init(cpu_pmu); +} + +static int m2_pmu_blizzard_init(struct arm_pmu *cpu_pmu) +{ + cpu_pmu->name =3D "apple_blizzard_pmu"; + return m1_pmu_init(cpu_pmu); +} + static const struct of_device_id m1_pmu_of_device_ids[] =3D { + { .compatible =3D "apple,avalanche-pmu", .data =3D m2_pmu_avalanche_init,= }, + { .compatible =3D "apple,blizzard-pmu", .data =3D m2_pmu_blizzard_init, }, { .compatible =3D "apple,icestorm-pmu", .data =3D m1_pmu_ice_init, }, { .compatible =3D "apple,firestorm-pmu", .data =3D m1_pmu_fire_init, }, { }, --=20 2.39.1