From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 EDEB4256C95; Tue, 11 Feb 2025 16:08:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739290106; cv=none; b=INyyPcjxcB9qglytN6rez1UMdMkkQx/VwP64dZu+GQJ5lZh0j0XOGsO5CWDQ+ZyHnzsP6ks4icysb247qFZBeBUhb7k2+JfJnYVrvnZvTvviw4a/++0kevtMiIvhbVR109HLcQdbIxsO7M8p2klU5ejbZL/9JZYNhcw5Ie4ip4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739290106; c=relaxed/simple; bh=gQs9caovUGQok2nCifAixdGJFEgkZT2VLjuftKNGAZk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cH4VwIAoHGdeq4vuS+BYdN4DEGUhl/Bxnx411cPztZpNu4rEw6Fk1+X8T1GrVCLUMAcbmbfQYx7+h/OfCquBUfrIeYvHOGVNEZhJLqkCX0QCl2d8Ec02IXYyp1LVMQgXmKsnaMSFXHTAWmxeQNY3iurn/pvtCfaeLIhud+V31FE= 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=G4Sf3Pkh; arc=none smtp.client-ip=209.85.216.52 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="G4Sf3Pkh" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fa345713a8so7693923a91.2; Tue, 11 Feb 2025 08:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739290104; x=1739894904; 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=uEntLtHz4WyreVvdYG90vu3xiJUwTFLXejk99s9G7I8=; b=G4Sf3PkhoDTb7m2bWF/mYA2hg1YdG+Lmkt0eYf1l5Sy9xB3syNtrAF5/Qpof+OGJuw CSZPbEsrYAfdfdKP/YqB36sb6IcG/Aw4RRf4hSe4+Jdtj/mO6OUehC9hLx2dlAbf8PQ8 /ciau/2kFXfUkDEseuF0gP5g2Oz7ZsoffFPVLyIRiSiGHZUPcMbccfppt9aAFYnz/1hx oJYegF4UROin2s6J5S0wbl/Y6t8x06BeWg0N5uDQlsFRNqxUIgMHqUjgCoT2NzB+ryS8 1gA0qmi3vRjM9OBvOVkGyAJhVyHlQNVcvki5PJizPi2NM1Hhmjku7QQaBOjmXS//1s8m 297g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739290104; x=1739894904; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uEntLtHz4WyreVvdYG90vu3xiJUwTFLXejk99s9G7I8=; b=UYJnkjnS7r6u8GlnhTXKNVXP+LXA9nEUfUk1FTjmlbpkgyDHYLRvO/qG7v46wC9bdT hppA+fPFmYr3zWJTRqiVnqUjQAAhG/A50UyLEpL9+WnVIKN0zDt+qsjPyi9FX8XV6CCN Ex01gfb7/3zy+csXJMGOPL2HvVYMDVUAZ4pzPoCHmXg1y0jsGyiBdtxEuicg9Kwvkvsr DCOZqVp+yPqRD2BgJzRRHrZWH8vsOJwz8aAzp4cqGn+14MR5H54sdLplZywmEId5BFop J0oKLq6GMwPRixpj+QyYrvrVgVG3lG/8GPSt8gUoVENu3kSiWTQKhois9fWUvmAP8huG k/dg== X-Forwarded-Encrypted: i=1; AJvYcCV98f0/96rmg9vOG9EHVvS0sx2qUZcVSKa40QqTljH/0HKnky30FqgYmQTjsFC0z+Q3YKhG5X2e7y4uPDwR@vger.kernel.org, AJvYcCVY/StKo3lNqXFIJDKLTvfmwOOdpvI8OKUcnTu0S0L30pDZznR96M2YpGPCj/hXKbpJLvIEqcA07W1R@vger.kernel.org, AJvYcCWh8lGlw2scIp92RsZHMiNWaCPZwHWt3C2MJNFV7x+64qJzIM+B7P9UCZXjn2VwGSJ8LSdfko4c3tfL32OCIbxKJw==@vger.kernel.org X-Gm-Message-State: AOJu0Yz/SUg9mPgjkuaJvDzC91r7FaSk2BVe4g0dO/kjN+D9g3b+capt 2xFuVlCixagQYTBAe2p22Dl6yy2wkroHpK9DTN9SC/mg7T361O3/ X-Gm-Gg: ASbGncu9WNovPMP8grhpbakSDiUo7SZwAyydLj2pHwMOHvBP32EJOqd4jEXwrj55fVk Dq36VyKJ2WOfbwf6M8Kf5yTTvKTjN1sYcjbjw6dRAbEIbqQm3yF0CF5Z93CS5FowPrzhty7Xz2E sv1RBwrR5bEi8YfCzFPvjiACosHFAmbWFXvaqTx8kwbewl0WE4CwlI4FTYV+uPMXUI7l4cXlv1U gSk+yjIjSVKG4Ya6nExwxNPK/sjY7kcKfNGQsIcSO29eywv0Fous8uYtVm3Nz1ibf7mj08/yzIv KCE6w6m1nKjbH+8dEA== X-Google-Smtp-Source: AGHT+IEMlQ8kqWyBtETjcYInexsO3wrAznZUhzIxMTN/xckLpbtrZpA4GAT8HBvg6O+adCuJbKKOBA== X-Received: by 2002:a17:90b:1e4e:b0:2ee:45fd:34f2 with SMTP id 98e67ed59e1d1-2fa23f565d8mr23851683a91.6.1739290104015; Tue, 11 Feb 2025 08:08:24 -0800 (PST) Received: from [127.0.1.1] ([59.188.211.160]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2fa618e5e18sm6040478a91.41.2025.02.11.08.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 08:08:23 -0800 (PST) From: Nick Chan Date: Wed, 12 Feb 2025 00:07:25 +0800 Subject: [PATCH 04/10] drivers/perf: apple_m1: Support configuring counters for 32-bit EL0 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250212-apple-cpmu-v1-4-f8c7f2ac1743@gmail.com> References: <20250212-apple-cpmu-v1-0-f8c7f2ac1743@gmail.com> In-Reply-To: <20250212-apple-cpmu-v1-0-f8c7f2ac1743@gmail.com> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas 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=1826; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=gQs9caovUGQok2nCifAixdGJFEgkZT2VLjuftKNGAZk=; b=owEBbQKS/ZANAwAIAQHKCLemxQgkAcsmYgBnq3XnrvthgwukKuQgQqkT+wKNLkCh7f6Uj8zfB 3RsovLrxOSJAjMEAAEIAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCZ6t15wAKCRABygi3psUI JJcDD/9Xa3lG9+foU72POXq17q9s3tzKS7KN12596keegPogu+bO2b/Hxb/kdQUrKeU2Cid3aWM QDJ7quwXGR8GjRg/3YQqvhZPjOIzqknyV5sD7UJsR5IFEtVYX/TkVZOEnyNVRT8QKiqT90CBlT9 WyVpnSymp04tTfQUR+7Af9p3T6pfIJHFoUQeqq7+eaCNRziy9WH5wcaPpgvaGm3GpnGuhye8nB8 uIzx4rEnbHXIdC15u6zs/GXkMJT8J6HRUwmS7UUL9VjS3VxGSSu/bi99MsU/ksd7Qyy6Y0ImnNq 3eOHrZaEy1NvtZfGh9R05MLvj2hq+RY8pMO2x/od/HvyN+9XvZ+Aoy1HVaHCS2c8l7lBRAaDVo6 z/sdKOrFSdaWkLkO27gb9eb5xzXt1LPTLyCBxBwRE+m78V7ncXWlhfgXtQ7XO67ZNIYKAhJpZr/ 8cJtR0oEr+Md874UgXV4rCeeoHvF7nu3405cKLidESyW5XW3/HNuLnaPzHNwsnUeg6zkicA5xbD LeenyCVjjkudXVnenBL7HuL2df34xtCuLxVLG+cUUWfgyDf0GfYbZAhQQpbJcDgrDDnzXA9tpl+ 0rfTDIIYo7lz8SNfMXpWn/F9mkJbPTMTCc96K4gYM+mXqPDSo7vdSIXA4FV/Z7sBHrVeqqZAyuA kBY4khho2yLIlPA== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Add support for configuring counters for 32-bit EL0 to allow adding support for implementations with 32-bit EL0. For documentation purposes, also add the bitmask for configuring counters for 64-bit EL3. Signed-off-by: Nick Chan --- arch/arm64/include/asm/apple_m1_pmu.h | 2 ++ drivers/perf/apple_m1_cpu_pmu.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/arm64/include/asm/apple_m1_pmu.h b/arch/arm64/include/asm/apple_m1_pmu.h index 99483b19b99fca38483faad443ad4bcf4b85ef63..835d602a9a33fc812982839799c0bbabef656078 100644 --- a/arch/arm64/include/asm/apple_m1_pmu.h +++ b/arch/arm64/include/asm/apple_m1_pmu.h @@ -37,8 +37,10 @@ #define PMCR0_PMI_ENABLE_8_9 GENMASK(45, 44) #define SYS_IMP_APL_PMCR1_EL1 sys_reg(3, 1, 15, 1, 0) +#define PMCR1_COUNT_A32_EL0_0_7 GENMASK(7, 0) #define PMCR1_COUNT_A64_EL0_0_7 GENMASK(15, 8) #define PMCR1_COUNT_A64_EL1_0_7 GENMASK(23, 16) +#define PMCR1_COUNT_A64_EL3_0_7 GENMASK(31, 24) #define PMCR1_COUNT_A64_EL0_8_9 GENMASK(41, 40) #define PMCR1_COUNT_A64_EL1_8_9 GENMASK(49, 48) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index ae91848bcd828be197fc21bb2195f3e2460edc65..06ae20332e79f7dfa819f764a3752fefe53bf5b8 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -335,6 +335,9 @@ static void m1_pmu_configure_counter(unsigned int index, u8 event, case 0 ... 7: user_bit = BIT(get_bit_offset(index, PMCR1_COUNT_A64_EL0_0_7)); kernel_bit = BIT(get_bit_offset(index, PMCR1_COUNT_A64_EL1_0_7)); + + if (system_supports_32bit_el0()) + user_bit |= BIT(get_bit_offset(index, PMCR1_COUNT_A32_EL0_0_7)); break; case 8 ... 9: user_bit = BIT(get_bit_offset(index - 8, PMCR1_COUNT_A64_EL0_8_9)); -- 2.48.1