From nobody Sat Feb 7 06:36:05 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 3F2BE2820C6 for ; Thu, 1 Jan 2026 09:02:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767258166; cv=none; b=bPlUx6DCz2T7uXLiiqQho8I0VETh3FNnYBsfpZOXa41D9k9OpKYO7szie2yhXbjpdzUpncG45KlnzNqkR2JaGYZ3clTrH/43C1d9pRotSZ/cxL4zIOr3sVrd7hxmgwlAIF2gcg4gtw3UmP//1EYg7cnAPHb5nE1zOnBPJN+yfSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767258166; c=relaxed/simple; bh=T7VIuEp6hEe3RkCETbS7KqP+//z7d2ZDmQMS7i30tSU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PbQS6KQICEP+4nmxfp6CXDJ/SD7Ft4ENQu+4thltWtwEdC4GoauxwlSvhE8eoOy4exGh6trlROYefYU9qEv0zGuCuKIrDJWOZDJ7yMHd8swRRxewBclglKAD7+3LFzqTv9TT6AJJk8/5cEz9FlkNoVb1GWJVe666OYZ6V+uJNaU= 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=jQWOb1zY; arc=none smtp.client-ip=209.85.210.179 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="jQWOb1zY" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so8359001b3a.0 for ; Thu, 01 Jan 2026 01:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767258163; x=1767862963; 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=gnmU0etDq0lcWJuNgsoBFmFUTXG/dt5JQHfVECxG+u0=; b=jQWOb1zYrKym2cyozQPiQHSx6OzTx8q6juktqeIYNsaC5jTZek/8bnJyMB//zf1OsB yDRjEPaFKnSliz9WljRdNjwXNghxNbGow1DmKV8+kzUz8AHDQ7+xfGRY590LULfUhoj4 gywtz3wWB5j8xP5X0wPX1NGWv0saPZ/DvBMaLy6K7ZwJKKxDS/ssiClcBj9C0Yqk5Eoe tqdxC6MMh3i7EbvJ2wCwGm4Kv90pBYEFgnat1MNLSwHUgtvbOXNh+OFKiiOlYmSM6DRo 83CeBHMYlWoA+qAR0KjJrWCLuGV2SPtl4gUpHTCjzICV4YO6lJKWaKE4UnHd64zFCIM1 6vfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767258163; x=1767862963; 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=gnmU0etDq0lcWJuNgsoBFmFUTXG/dt5JQHfVECxG+u0=; b=gEvQ2+r8wIcc5L/re980gcySNaM1j+FKENXQOb/uiRTqq/QlWySUcSd03jB/ZkBd7f +ryrPVT5NGiIkWSXzbP+lwZDdu0iD1J3PCgPe0K2nHu87vP9RsYmymCD04Ib6TqQIcDi 6BQIjsQOri+CcimcmtXYTU7Wui6HT/OeJqIzP2K+or6hQv1oXkc+w9o+joMmrd+Dp05i Nlc4t0KD9aENYPxfI3UqsE7GDAnHXgTvAwGHBBkXC+QBtwntd31eqNqmQp3zBxOzCkjI 5RRvu8Fvo7WI1DsoWNyVHh+uKrSSGmdcuPr+dVmr5AwNE/L6xuEbgOa+zIYLMEbwxPoq u8Cw== X-Forwarded-Encrypted: i=1; AJvYcCUL2/2418ht5xHjqIyZxFVr8cxswOmFHnw/Ihw1DZYqBjT5YfOviZoSpkEkfrX209eu8SU9AlpM7JAULSQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq6W2/8lHjF7umvV9XicYZbFBawk1kKgr8mF0vQgNg3PiQQpBl Fu0CkmuN6i/5lVQUX0qPqrtzDuGIciEC1Kk71vjy9xeSOJFLOihyKsfP X-Gm-Gg: AY/fxX4pVR0CBnVeH6tir6qpr/Q7WnlRIXxPwDgDPVwYq7g0zXv5//eiwdomBkLhuRI 1Zdw13t+THCUBSDMsodAammu5LzpbCuTvKOG3HfqqnW1GpMzH6QuYekGoEtm72Sdl+Uqf8LceOO k2/clOM8PhV8i/wtguvrh/l62FRXVNN1sGFic9GHGqFpftoVb4FNqVBemRiTvuUELrevf+6PDBC Ba8yAG/2IAvU5U7KFfJYxLyxdZ2MCDTdlaUCZ6Jyt571kjgqCbyAG2zWkJSmgKalpwyQXWKQQzU Wt7ZohDG0dcg23OXWqzzlV6pVxna/DCIYCJv8QnRVZZrnDdpAhf3aS946TDL/c+OWt8lXxEHAAr 43qZQk24LcB/qf/dLhNVW3zJGe/QMlSNM9tCbnYwk4ME5kDWtOpYMKyWNINeZZK+jtMIdEEiBP8 FUonAAAVdHrRCB X-Google-Smtp-Source: AGHT+IFmkrWKS/7FmmxYOa2Rc6IAdldSe0vW+VCQopk2Z3V5RjuuRrxz6yRgFXBslyCW8xVE0ysndA== X-Received: by 2002:a05:6a20:9389:b0:35f:fafa:a198 with SMTP id adf61e73a8af0-376a75e8a87mr34983779637.10.1767258163369; Thu, 01 Jan 2026 01:02:43 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jan 2026 01:02:43 -0800 (PST) From: Nick Chan Date: Thu, 01 Jan 2026 17:01:38 +0800 Subject: [PATCH v10 02/21] drivers/perf: apple_m1: Only init PMUv3 remap when EL2 is available 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-2-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=1251; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=T7VIuEp6hEe3RkCETbS7KqP+//z7d2ZDmQMS7i30tSU=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpVjgmcioDFW/cgCyqzljV2Zk1HIbx3mEdkkvCz qn5UQHjIACJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaVY4JgAKCRABygi3psUI JGHYEACifxfNp4MaPvu9Ha3yNIOsVV8p76VKZFaIJFNpIC2Zg32i/Ut43TnFCiS8KNa/Z1lMnvH qO2YUVuRgPglNl5teGrwBILvKrc+4Mfr5cz/z0PM3SwzzZfU6ErE0gSfIjTjLF/garU0bJFiww5 AhIKOOKrQg0sSuyk0+5/j7fdr23No9zE0cUYiaPyyZ6PsapXl7uZScKxqxv0UJ6otVAjdwDyK7Z yF5hb+lc24Ty3SeSNKwx++AeHURmH1I1f4lAGa3bMtyLrhd+xISa+eAMvPlWBSmp/c7B/ag0KDJ newogHd+vtN2SwJWTwHI/w3yoSRAuqh19czHPd+V73lGBQnJxVWHXrDFKPoGbHvoBPfQYkuTTwI nmwi3Eta7gpDcEOhBcX8n0fNpkM/6vliM3cEK0ZTsZQ61/eUZdrpJogIPCB43iLAkFJX0Y8pKkE Sri65VYBlADVMF9l/fcPp4Y37troNgDsNsiLhpRF+kZe+2UmxnE+TbkKd23JKopNYQ4blJUZmz5 y+M7KTk69CdhgQp9fD1LmQ+8PpIcOf/qFrUr33awtQ26sF5F8l1Wlm7zDriYpBRjPvpw1d86YqU uWW180xDiOmD258mV0eFbE34YjS0MTPFY+HNJc7O7QiVi3C1S5D7b87hGnIlnFPSp8hLGbzajf4 8iYG31jc9OUZNiw== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 The events in the Apple A7 PMU is very different from the ones in M1, and EL2 is not available on Apple A7. Instead of assigning the wrong PMUv3 remap on A7 or declaring a new PMUv3 remap that would never be used in practice, skip initializing PMUv3 remap altogther when EL2 is unavailable. Signed-off-by: Nick Chan --- drivers/perf/apple_m1_cpu_pmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pm= u.c index 81b6f1a623499566ef04d04075752f34e2cb6a92..f3948528e28e0189efd0f17fde0= d808930d936af 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -645,8 +645,10 @@ static int m1_pmu_init(struct arm_pmu *cpu_pmu, u32 fl= ags) cpu_pmu->reset =3D m1_pmu_reset; cpu_pmu->set_event_filter =3D m1_pmu_set_event_filter; =20 - cpu_pmu->map_pmuv3_event =3D m1_pmu_map_pmuv3_event; - m1_pmu_init_pmceid(cpu_pmu); + if (is_hyp_mode_available()) { + cpu_pmu->map_pmuv3_event =3D m1_pmu_map_pmuv3_event; + m1_pmu_init_pmceid(cpu_pmu); + } =20 bitmap_set(cpu_pmu->cntr_mask, 0, M1_PMU_NR_COUNTERS); cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =3D &m1_pmu_events_attr_gr= oup; --=20 2.52.0