From nobody Sat Feb 7 06:35:40 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8437028002B for ; Thu, 1 Jan 2026 09:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767258172; cv=none; b=lwDcem2iT0htq3VI3KAy7u6xmDgBbtUUW/pk5NZ4iZlD43gEO++nX5NLee00PnFGEK8jbfyKgi2DyPde03RpU2xjpvLH4gFTQg8zI7BzTRz8TEH8Gr7HLipQNPYnZkx2nG/d6dZA8TQqjrkE9JIEYdefJEVcQ6NXPP700qQ4oss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767258172; c=relaxed/simple; bh=vnsmCGSw7Ox/D+cYElRWl33lnlkyIEYomCaHfMV1wgk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A98E8TOgkSga/1NnZzt101J536AvDW2FZY4hyOwcAtPPAPvfRiMNT+bdtSwnR2Q9Iceo9ceMeDgu2K1TDW9UIfHPyHw6z57OsqrJ99sLISZHYB/aTGo6dl7JIT+DWgh/8gojxuLNjtBOu+l+Vf+7aW4T+VrdUwERySYYOIW7IJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cExs9hxc; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cExs9hxc" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7bc248dc16aso9036971b3a.0 for ; Thu, 01 Jan 2026 01:02:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767258170; x=1767862970; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mzvjVfHrZzra3wF9+A+Do+FwcxmxMk+rXbtL9/jEreg=; b=cExs9hxcqSujTYewwTpAT4RPcxVqcFjpr11qodX7zJZ96XRjJM29JWgj3PV7VG32z/ CttaVTBzoOY0WuQVQjkQO7vwkQZRHwXTOW7XB0nj0LA5Z/8ZuGiCNN3DU/40i6oRPOnm aM7o51cqTmWmzIjKh4VAffO8xAfN/a8kxLr57flA+c0XMLBSTu4shqVlw/eTRGjxS9b/ 4o3vaUpuRPG2jK8/EXxU+pygJq4QmKky9ieqGhmYGiDnRoH5IeIC9i73tezh6jZFcmqd JgLWygs4Z95Z3yJQKDfNYKk0F0goXx8/UfJsz8PA+K6iOP861dtCG8wYiPwV9BzVDWQB on1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767258170; x=1767862970; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=mzvjVfHrZzra3wF9+A+Do+FwcxmxMk+rXbtL9/jEreg=; b=uKncJbaBGdDyNjFAb1x5EGe0/pToTkLt2p9teV70IMJlkyr2T6oFtHdY2vgVzrmqY6 ImdDQwWQoD++Uu8nvzcpKjN5Jmf79C8URS+4q1jbloM/yj+k8U9ZJYRAjoUPajDZ/LjP RGl0WQ9WlINoBq5ral+8xh6GuYpUH09BLwPs1O7rRvCt26CGEAN53KiP7sh1b19OL+N5 CwJgoHHRbPekBZ2sKOgMSpEpbpzVKe2JuvPsKaOto9kwN51wdRicwCslRRSDuJ6blGox mH0cHBtn7mIjwYqVUBA1RQblfwPeAz/w1kQQFWqkdVoExlc9NHY/HQQr4qAFv7gZmRSC zuxw== X-Forwarded-Encrypted: i=1; AJvYcCVeKwVAbt8PlwUA797MNbNCBEiAJsrsmXMXofiMTKKA5ACTzHskOaufo5GYykDc+D4M2INJ91EImadv1pk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyo3OC/i4yMKBFtgZeIftIgmfeycE8Fz44kHNscxJE38qNsn2UC DYRpWK56oWmUxy05f87e1c4qmidb+cWPli4EfH1qFKfQOdOHmc5kx9s2 X-Gm-Gg: AY/fxX46/qV6YP/so7ysjRS7KeeAj+lBEh6avjOmiwt8281D3tonT/gsRkjKIJhdf19 SqLwORoGbeGoe/4VdKDrcg3iaWhWVBWxkHp6142jjbtBT0WiisFhtPg7JfY2nF3eJt5eDe8Tl8Y SgJb2THrvbcOrtxNwjHwnMySxckoQT4sLiD4YPPoFAYiVtw8Q36/yfyP/JGtUdU5zCYbIjh3RLq pZERSTFTRBCpRlKrKRhl730cSufT99rbcxCAnYQOzViK87gG00hiqHShbZ4xKj3bzGzyeMc6QFo aJZiSFAIdjZZWxy2yn0OORd7NyOe5H0m3qpQ6yPsb1hXN2JsyBMKFHjAqkcyQ0jN60DQG8jqA1P FX9d+M5gUUs8ssDF07oTtb54TI2tCb22lnlfsfje0T5JtR9Gelhh0KpP5GiB0CEU2h2XwAzj3xD Wdz6q+1Wrau7l0 X-Google-Smtp-Source: AGHT+IEX1s5ks4GSf9vW+xRL0kaPOFIGucJSrgtfX5TcAhrNEbjWInD/uhlAFVi+IvqgSG5t8zgPJw== X-Received: by 2002:a05:6a00:801b:b0:7e8:4587:e8cf with SMTP id d2e1a72fcca58-7ff66a6ea42mr36292504b3a.66.1767258169687; Thu, 01 Jan 2026 01:02:49 -0800 (PST) Received: from [127.0.1.1] ([59.188.211.98]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7ff7dfac29bsm37182957b3a.39.2026.01.01.01.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jan 2026 01:02:49 -0800 (PST) From: Nick Chan Date: Thu, 01 Jan 2026 17:01:40 +0800 Subject: [PATCH v10 04/21] drivers/perf: apple_m1: Support a per-implementation number of counters Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260101-apple-cpmu-v10-4-48812c529ffc@gmail.com> References: <20260101-apple-cpmu-v10-0-48812c529ffc@gmail.com> In-Reply-To: <20260101-apple-cpmu-v10-0-48812c529ffc@gmail.com> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Janne Grunau , Neal Gompa , Sven Peter Cc: Marc Zyngier , 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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5683; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=vnsmCGSw7Ox/D+cYElRWl33lnlkyIEYomCaHfMV1wgk=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpVjgmHJtVqtjeoiJKKIhDQt9qIWdQDOC/zGFyo QkRwkr9DvmJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaVY4JgAKCRABygi3psUI JARoD/9Zh0Vhm/bNiMMe2pBZbvJMqnJf2oHnxk2JKgdwWa9kfkiQlZbdzArn7sqWM8wmDXbjmco mfsYi8LvlBm9vrklaUZwi9yKoavfyZNHTu9YF4sP77fFG40ipagDZxmzKPdcgQTHRveTwbEczcz mA3FjuTxhDkud544e8b130aLcMJIPa/YL68X9VZKFFoLze5bgIJzfDLvORZHyJ4MOaXDMWI05Cf XkYofevpChBhCV942gZQQ2CZPpD2DTaHWrXhVxOdCu8SHxpWMW1gb4lgCNMgud4UW7tubdreqw7 JTPbeLeyPpTbJeiHxg3jvHSWO1qLDT6sJthyWyZxNyD8QxctRZ/zY2qFJxH1YmCDXRmuI0BEBEv Fxo2qKPAn7pqD++V6b4lmI1qd1ZaEoJe29aJtC6oR9foGsOtB9vGHuBiTMBY93Hsp36hQej1oBu IM5FxvDfDO+UFyZ7gr26B7Es3Lub6sBjENMN46CvAX4PlqxzSkIaEPyz1JEOr2npVSzioUKYTzV lm+/84J31ToC7iwpAqnWE28ADkpGJh1nQU4oEfKe5MPTzdRILSGPHdH4zBPFlQE8EVy0HmwYodc EaDb9rDSljSH+f2l31Ogp2i3GjaDgWBsq+Q4RMthooPQtrfZHCDI+L1layneq2efUroKVN22MWD 3qxb75Yp5k6w5yQ== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Support a per-implementation number of counters to allow adding support for implementations with less counters. Signed-off-by: Nick Chan --- drivers/perf/apple_m1_cpu_pmu.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pm= u.c index b4ab6a3e5df965b7ef450d7e533995f3cc8633fd..0b0ee2b9ad4b555f66b9b478055= a420b7eec8f3c 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -20,6 +20,7 @@ #include =20 #define M1_PMU_NR_COUNTERS 10 +#define APPLE_PMU_MAX_NR_COUNTERS 10 =20 #define M1_PMU_CFG_EVENT GENMASK(7, 0) =20 @@ -459,7 +460,7 @@ static irqreturn_t m1_pmu_handle_irq(struct arm_pmu *cp= u_pmu) =20 regs =3D get_irq_regs(); =20 - for_each_set_bit(idx, cpu_pmu->cntr_mask, M1_PMU_NR_COUNTERS) { + for_each_set_bit(idx, cpu_pmu->cntr_mask, APPLE_PMU_MAX_NR_COUNTERS) { struct perf_event *event =3D cpuc->events[idx]; struct perf_sample_data data; =20 @@ -492,7 +493,8 @@ static void m1_pmu_write_counter(struct perf_event *eve= nt, u64 value) =20 static int apple_pmu_get_event_idx(struct pmu_hw_events *cpuc, struct perf_event *event, - const u16 event_affinities[]) + const u16 event_affinities[], + u8 nr_counters) { unsigned long evtype =3D event->hw.config_base & M1_PMU_CFG_EVENT; unsigned long affinity =3D event_affinities[evtype]; @@ -506,7 +508,7 @@ static int apple_pmu_get_event_idx(struct pmu_hw_events= *cpuc, * counting on the PMU at any given time, and by placing the * most constraining events first. */ - for_each_set_bit(idx, &affinity, M1_PMU_NR_COUNTERS) { + for_each_set_bit(idx, &affinity, nr_counters) { if (!test_and_set_bit(idx, cpuc->used_mask)) return idx; } @@ -517,7 +519,8 @@ static int apple_pmu_get_event_idx(struct pmu_hw_events= *cpuc, static int m1_pmu_get_event_idx(struct pmu_hw_events *cpuc, struct perf_event *event) { - return apple_pmu_get_event_idx(cpuc, event, m1_pmu_event_affinity); + return apple_pmu_get_event_idx(cpuc, event, m1_pmu_event_affinity, + M1_PMU_NR_COUNTERS); } =20 static void m1_pmu_clear_event_idx(struct pmu_hw_events *cpuc, @@ -601,13 +604,13 @@ static void m1_pmu_init_pmceid(struct arm_pmu *pmu) } } =20 -static void m1_pmu_reset(void *info) +static void apple_pmu_reset(void *info, u32 counters) { int i; =20 __m1_pmu_set_mode(PMCR0_IMODE_OFF); =20 - for (i =3D 0; i < M1_PMU_NR_COUNTERS; i++) { + for (i =3D 0; i < counters; i++) { m1_pmu_disable_counter(i); m1_pmu_disable_counter_interrupt(i); m1_pmu_write_hw_counter(0, i); @@ -616,6 +619,11 @@ static void m1_pmu_reset(void *info) isb(); } =20 +static void m1_pmu_reset(void *info) +{ + apple_pmu_reset(info, M1_PMU_NR_COUNTERS); +} + static int m1_pmu_set_event_filter(struct hw_perf_event *event, struct perf_event_attr *attr) { @@ -639,7 +647,7 @@ static int m1_pmu_set_event_filter(struct hw_perf_event= *event, return 0; } =20 -static int apple_pmu_init(struct arm_pmu *cpu_pmu) +static int apple_pmu_init(struct arm_pmu *cpu_pmu, u32 nr_counters) { cpu_pmu->handle_irq =3D m1_pmu_handle_irq; cpu_pmu->enable =3D m1_pmu_enable_event; @@ -649,7 +657,6 @@ static int apple_pmu_init(struct arm_pmu *cpu_pmu) cpu_pmu->clear_event_idx =3D m1_pmu_clear_event_idx; cpu_pmu->start =3D m1_pmu_start; cpu_pmu->stop =3D m1_pmu_stop; - cpu_pmu->reset =3D m1_pmu_reset; cpu_pmu->set_event_filter =3D m1_pmu_set_event_filter; =20 if (is_hyp_mode_available()) { @@ -657,7 +664,7 @@ static int apple_pmu_init(struct arm_pmu *cpu_pmu) m1_pmu_init_pmceid(cpu_pmu); } =20 - bitmap_set(cpu_pmu->cntr_mask, 0, M1_PMU_NR_COUNTERS); + bitmap_set(cpu_pmu->cntr_mask, 0, nr_counters); cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =3D &m1_pmu_events_attr_gr= oup; cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =3D &m1_pmu_format_attr_g= roup; return 0; @@ -669,7 +676,8 @@ static int m1_pmu_ice_init(struct arm_pmu *cpu_pmu) cpu_pmu->name =3D "apple_icestorm_pmu"; cpu_pmu->get_event_idx =3D m1_pmu_get_event_idx; cpu_pmu->map_event =3D m1_pmu_map_event; - return apple_pmu_init(cpu_pmu); + cpu_pmu->reset =3D m1_pmu_reset; + return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS); } =20 static int m1_pmu_fire_init(struct arm_pmu *cpu_pmu) @@ -677,7 +685,8 @@ static int m1_pmu_fire_init(struct arm_pmu *cpu_pmu) cpu_pmu->name =3D "apple_firestorm_pmu"; cpu_pmu->get_event_idx =3D m1_pmu_get_event_idx; cpu_pmu->map_event =3D m1_pmu_map_event; - return apple_pmu_init(cpu_pmu); + cpu_pmu->reset =3D m1_pmu_reset; + return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS); } =20 static int m2_pmu_avalanche_init(struct arm_pmu *cpu_pmu) @@ -685,7 +694,8 @@ static int m2_pmu_avalanche_init(struct arm_pmu *cpu_pm= u) cpu_pmu->name =3D "apple_avalanche_pmu"; cpu_pmu->get_event_idx =3D m1_pmu_get_event_idx; cpu_pmu->map_event =3D m2_pmu_map_event; - return apple_pmu_init(cpu_pmu); + cpu_pmu->reset =3D m1_pmu_reset; + return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS); } =20 static int m2_pmu_blizzard_init(struct arm_pmu *cpu_pmu) @@ -693,7 +703,8 @@ static int m2_pmu_blizzard_init(struct arm_pmu *cpu_pmu) cpu_pmu->name =3D "apple_blizzard_pmu"; cpu_pmu->get_event_idx =3D m1_pmu_get_event_idx; cpu_pmu->map_event =3D m2_pmu_map_event; - return apple_pmu_init(cpu_pmu); + cpu_pmu->reset =3D m1_pmu_reset; + return apple_pmu_init(cpu_pmu, M1_PMU_NR_COUNTERS); } =20 static const struct of_device_id m1_pmu_of_device_ids[] =3D { --=20 2.52.0