From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 4424734DCFD for ; Wed, 17 Dec 2025 16:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765988711; cv=none; b=Hr0HaM2PFOJKNWLSr1YVjlaD6j7kZAOFT5A2A7UV3g/hszU/aRANvPYp0czPycGKjw1XAqt31p1Uf1SWXobc5t3ROOl4ZOSDWaJ1IvdDDIx8QEifGqfJTLX2GeGrPzxuHuD+QoOlXdMyLlHpwUxKG46a7kNT3/f42FbwELAPeec= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765988711; c=relaxed/simple; bh=vLu/+OqRMT1X7TlFdalfyOPG831mJ/wTZfPnuqM9o00=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MXQtECW24uxvlcsRvtqGatIeARRjlgAf6DvGou+75fTfI3d4GqZhKtd6deZpjMDOPBjBsCnKaRh7Nl/U0sCGu/nNMzGJQuOjASeEJykVWMXphA5RaC6mJ1GZZTa4g4Ex5t+7i7/h/E6QAY/vRFTLuFccmtZjTZu/ZezvUgxLXOs= 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=KpQi5ayP; arc=none smtp.client-ip=209.85.214.174 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="KpQi5ayP" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-29f1bc40b35so90118255ad.2 for ; Wed, 17 Dec 2025 08:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765988708; x=1766593508; darn=lists.linux.dev; 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=qW3ZbNXx0HHrwclPZikgyrFB8Zc0ZjRt1oD1fmLPJs4=; b=KpQi5ayPlzQsj/LSFjTOgwCgQwhSJnNefc0BqMrgA9tdK4+zICPCggUcgtwBgJiIaN u/BcGyECoQM/nhElgk+GZxLxpSk8M2OolKF4WvcdFeupG0nd49dYy/zdo989U5fI+iGJ 165+Zowua1EOArkwdipkzsoN/K3c3X912PmZHguzlyKrTaFmczvjA4x9ckTWQuaFOxuK I+NmZalgrfFz6w2DEhaNzujf+P9Hahod8KXMGQJ7W7eyUgVR2Es5aT3TdLJ7jOmdSi7o H2u4/pl2qudjCZZRIp8I5JoUA9x6pFiOhqCVy7q/AiSet8uE6ZqYLHAWwHB2LIRC9khR RUQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765988708; x=1766593508; 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=qW3ZbNXx0HHrwclPZikgyrFB8Zc0ZjRt1oD1fmLPJs4=; b=B4Q7Y2+dExnbEWcKAYqgAt8Zzb3tfhievCCfHG0gAJfmzoFb6CTzjP5/pnQXPj+XwI zosaTlzKdvw2Xm+f2w8YCLnj2XOn7zEZ7FZKapGo0D/cGvBXlUKEcFkvUXW+5aF6a0IQ 9fwKE88oUPZpvbBajEP20G2dGIuptpEWm0JnuJtRLyDaQh70I2wcYEqB8Y84SQf+pSAM Go5sElBSsVcrGMdI4T9YuQLLZ9IGJAIrZQTzhaY7IqKgq7eDxr7QGiZmddyr62Vfezfe jy0uw713VG1GQ17tJ/GnjIuo7f9IAIobJH/bo5SOswqctc2y0aM+5fztyX/UWF0ge1yY 5PqA== X-Forwarded-Encrypted: i=1; AJvYcCXKC/66fTxNkQwelL3Gj2EbqhzxL/lUFLSCGQgdi9ehcDUnRGGkIVv2VKAqC7ZEUKH8cWWXdA==@lists.linux.dev X-Gm-Message-State: AOJu0YzgBXXs+ZQ0hTl9qvj7Vvq9pWz9JyQElE0mhv0UxcTwANBzOpaR gdD6bxzsFkld1z56pmlAtmqNYEnvRfLJ+68UjnUgvwLr3uLrnlcW3o6DadXJ3zpM X-Gm-Gg: AY/fxX7zVAxaaWO1GRUAyY2I82g6G//TIT5KNKHGh4drSDrC3Wj2lLEpNnnTa4/8MUs iC3/TLYzfVrAAPa8Xm2oaBUYT/6crMmxDsfwv1a3tC2VLvXszJW+NJ5l7BG9BMWetuTZ6nMhKh3 tUEFzRXZ1TJ9y1Guw+cAWdJcLbm0/k2PC+Tqabogiruhyj0DNrLQpBLaJvCPNElmjR2+OOQoHgO 9ebrIF8JUSMfbn20ySTkl62tP8bCGr4BV+opMW7LGZccH5dBttqs7eZkTnke1McG0+WHd0coqKK WQqLIINyQxnTEV62Mn4+Ox5xSWf5UqyiggbPLYs7/y606bVgcBwCcSc0daZ5b9+1Q2kWWtBO71e DMpeF01TK9NU1b9w5uJyQ37tkUYVLfIXDD8ZBx2EqdKiC+qtBcZtH4z7S3c9vA56ptKR1wMr6oQ aprYnAsnkSxJpT X-Google-Smtp-Source: AGHT+IGjiBD3t+e1hX3Mtu35Xp8NsAoru6D1r6FrRsSn0sY3D+FKw2YdG/jG6iSfBbymnGi7hUIQGA== X-Received: by 2002:a17:902:f651:b0:2a0:f828:24a3 with SMTP id d9443c01a7336-2a0f828262emr119398885ad.28.1765988708015; Wed, 17 Dec 2025 08:25:08 -0800 (PST) Received: from [127.0.1.1] ([59.188.211.98]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2a0b0687c62sm122980415ad.88.2025.12.17.08.25.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 08:25:07 -0800 (PST) From: Nick Chan Date: Thu, 18 Dec 2025 00:23:22 +0800 Subject: [PATCH v9 09/21] drivers/perf: apple_m1: Add Apple A8/A8X support Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251218-apple-cpmu-v9-9-4deadbe65d03@gmail.com> References: <20251218-apple-cpmu-v9-0-4deadbe65d03@gmail.com> In-Reply-To: <20251218-apple-cpmu-v9-0-4deadbe65d03@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 , Ivaylo Ivanov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7370; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=vLu/+OqRMT1X7TlFdalfyOPG831mJ/wTZfPnuqM9o00=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBpQtlBECo5qDsfU9mK9nHsDsi4SE4nndMlWDpzw CFaoZslATqJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaULZQQAKCRABygi3psUI JNJpEACiH9/WA0MUZWWAGc7Bt/sDqvehUCoPtQlk/sMKEDSafY8+7Ytpb7/yCrCq5osiNEDyfdm BTELX7Rl4CIHWlcUA2bQ9qzIR+eirubFmGCpnwTIQyca6dZFnnTGufOJMGs+Zi6NRL/+pmmph4o lfPN+3qkQ/n7UI6CFMDsJ69AZcss7pWv/Fkmf3kwxGJIO1uKVF4doRaVpPmdgva5yVKKFlXg1f7 3Hm7jjcCucatBKtEI3Zb9AOhCwB4hkevPRWYYzORoudn3EWxIATI7/grBn+T/byngNLglZ/I/VZ eTl6dHS09I4OOaV38ZcdNUft8X0UwWPT611z/wVmdVmW083H7gtnHanrkuLSo3/GotB3Py55pqX Not/hOe4pZcDTifhSNjRpYGB+JRwua4sN2wTQEOnnKNp/hn2iZnIsWa4TZqbK3exW1vQA7OISf6 l2fK/nrdlCj6Z8wBzFvUJWb6jif7L/vQgUvNGCOEvi+SEEhCPor43mJDphN4dOlk+FV5XaqqJEj 4xOqbF6f2hng+G62tiTh0QTcXGXjMiFUKRM2IWUjsDoyNqRBR5+lrBK7QF1+dxLRPB2S/wBOItt JdmQw4LaEPAeCRMrfGdjq6sQCpuk3k12bHsDUyn2fBiDLokOgYC3U4qJ0MmKGGkNC9uZZs6vdV0 84HX69LjQYywJbg== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Add support for the CPU PMU found on the Apple A8, A8X SoCs. Tested-by: Ivaylo Ivanov Signed-off-by: Nick Chan --- drivers/perf/apple_m1_cpu_pmu.c | 124 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index afcf7c951379698ceff21c1a99cca31b3a6177b1..a95f4b717857b30284470487827954dd4b139010 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -28,6 +28,7 @@ #define ANY_BUT_0_1 GENMASK(9, 2) #define ONLY_2_TO_7 GENMASK(7, 2) #define ONLY_2_4_6 (BIT(2) | BIT(4) | BIT(6)) +#define ONLY_3_5_7 (BIT(3) | BIT(5) | BIT(7)) #define ONLY_5_6_7 (BIT(5) | BIT(6) | BIT(7)) /* @@ -183,6 +184,111 @@ static const u16 a7_pmu_event_affinity[A7_PMU_PERFCTR_LAST + 1] = { [A7_PMU_PERFCTR_UNKNOWN_fd] = ONLY_2_4_6, }; +enum a8_pmu_events { + A8_PMU_PERFCTR_UNKNOWN_1 = 0x1, + A8_PMU_PERFCTR_CORE_ACTIVE_CYCLE = 0x2, + A8_PMU_PERFCTR_L2_TLB_MISS_INSTRUCTION = 0xa, + A8_PMU_PERFCTR_L2_TLB_MISS_DATA = 0xb, + A8_PMU_PERFCTR_BIU_UPSTREAM_CYCLE = 0x13, + A8_PMU_PERFCTR_BIU_DOWNSTREAM_CYCLE = 0x14, + A8_PMU_PERFCTR_L2C_AGENT_LD = 0x1a, + A8_PMU_PERFCTR_L2C_AGENT_LD_MISS = 0x1b, + A8_PMU_PERFCTR_L2C_AGENT_ST = 0x1c, + A8_PMU_PERFCTR_L2C_AGENT_ST_MISS = 0x1d, + A8_PMU_PERFCTR_SCHEDULE_UOP = 0x52, + A8_PMU_PERFCTR_MAP_REWIND = 0x75, + A8_PMU_PERFCTR_MAP_STALL = 0x76, + A8_PMU_PERFCTR_MAP_INT_UOP = 0x7b, + A8_PMU_PERFCTR_MAP_LDST_UOP = 0x7c, + A8_PMU_PERFCTR_MAP_SIMD_UOP = 0x7d, + A8_PMU_PERFCTR_FLUSH_RESTART_OTHER_NONSPEC = 0x84, + A8_PMU_PERFCTR_INST_A32 = 0x8a, + A8_PMU_PERFCTR_INST_T32 = 0x8b, + A8_PMU_PERFCTR_INST_ALL = 0x8c, + A8_PMU_PERFCTR_INST_BRANCH = 0x8d, + A8_PMU_PERFCTR_INST_BRANCH_CALL = 0x8e, + A8_PMU_PERFCTR_INST_BRANCH_RET = 0x8f, + A8_PMU_PERFCTR_INST_BRANCH_TAKEN = 0x90, + A8_PMU_PERFCTR_INST_BRANCH_INDIR = 0x93, + A8_PMU_PERFCTR_INST_BRANCH_COND = 0x94, + A8_PMU_PERFCTR_INST_INT_LD = 0x95, + A8_PMU_PERFCTR_INST_INT_ST = 0x96, + A8_PMU_PERFCTR_INST_INT_ALU = 0x97, + A8_PMU_PERFCTR_INST_SIMD_LD = 0x98, + A8_PMU_PERFCTR_INST_SIMD_ST = 0x99, + A8_PMU_PERFCTR_INST_SIMD_ALU = 0x9a, + A8_PMU_PERFCTR_INST_LDST = 0x9b, + A8_PMU_PERFCTR_UNKNOWN_9c = 0x9c, + A8_PMU_PERFCTR_UNKNOWN_9f = 0x9f, + A8_PMU_PERFCTR_L1D_TLB_ACCESS = 0xa0, + A8_PMU_PERFCTR_L1D_TLB_MISS = 0xa1, + A8_PMU_PERFCTR_L1D_CACHE_MISS_ST = 0xa2, + A8_PMU_PERFCTR_L1D_CACHE_MISS_LD = 0xa3, + A8_PMU_PERFCTR_LD_UNIT_UOP = 0xa6, + A8_PMU_PERFCTR_ST_UNIT_UOP = 0xa7, + A8_PMU_PERFCTR_L1D_CACHE_WRITEBACK = 0xa8, + A8_PMU_PERFCTR_LDST_X64_UOP = 0xb1, + A8_PMU_PERFCTR_L1D_CACHE_MISS_LD_NONSPEC = 0xbf, + A8_PMU_PERFCTR_L1D_CACHE_MISS_ST_NONSPEC = 0xc0, + A8_PMU_PERFCTR_L1D_TLB_MISS_NONSPEC = 0xc1, + A8_PMU_PERFCTR_ST_MEMORY_ORDER_VIOLATION_NONSPEC = 0xc4, + A8_PMU_PERFCTR_BRANCH_COND_MISPRED_NONSPEC = 0xc5, + A8_PMU_PERFCTR_BRANCH_INDIR_MISPRED_NONSPEC = 0xc6, + A8_PMU_PERFCTR_BRANCH_RET_INDIR_MISPRED_NONSPEC = 0xc8, + A8_PMU_PERFCTR_BRANCH_CALL_INDIR_MISPRED_NONSPEC = 0xca, + A8_PMU_PERFCTR_BRANCH_MISPRED_NONSPEC = 0xcb, + A8_PMU_PERFCTR_FED_IC_MISS_DEMAND = 0xd3, + A8_PMU_PERFCTR_L1I_TLB_MISS_DEMAND = 0xd4, + A8_PMU_PERFCTR_FETCH_RESTART = 0xde, + A8_PMU_PERFCTR_UNKNOWN_f5 = 0xf5, + A8_PMU_PERFCTR_UNKNOWN_f6 = 0xf6, + A8_PMU_PERFCTR_UNKNOWN_f7 = 0xf7, + A8_PMU_PERFCTR_LAST = M1_PMU_CFG_EVENT, + + /* + * From this point onwards, these are not actual HW events, + * but attributes that get stored in hw->config_base. + */ + A8_PMU_CFG_COUNT_USER = BIT(8), + A8_PMU_CFG_COUNT_KERNEL = BIT(9), +}; + +static const u16 a8_pmu_event_affinity[A8_PMU_PERFCTR_LAST + 1] = { + [0 ... A8_PMU_PERFCTR_LAST] = ANY_BUT_0_1, + [A8_PMU_PERFCTR_UNKNOWN_1] = ONLY_5_6_7, + [A8_PMU_PERFCTR_CORE_ACTIVE_CYCLE] = ANY_BUT_0_1 | BIT(0), + [A8_PMU_PERFCTR_INST_A32] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_T32] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_ALL] = BIT(7) | BIT(1), + [A8_PMU_PERFCTR_INST_BRANCH] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_CALL] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_RET] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_TAKEN] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_INDIR] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_COND] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_LD] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_ST] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_ALU] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_LD] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_ST] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_ALU] = ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_LDST] = ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_9c] = ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_9f] = ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_CACHE_MISS_LD_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_CACHE_MISS_ST_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_TLB_MISS_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_ST_MEMORY_ORDER_VIOLATION_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_COND_MISPRED_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_INDIR_MISPRED_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_RET_INDIR_MISPRED_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_CALL_INDIR_MISPRED_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_MISPRED_NONSPEC] = ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_f5] = ANY_BUT_0_1, + [A8_PMU_PERFCTR_UNKNOWN_f6] = ONLY_3_5_7, + [A8_PMU_PERFCTR_UNKNOWN_f7] = ONLY_3_5_7, +}; + enum m1_pmu_events { M1_PMU_PERFCTR_RETIRE_UOP = 0x1, M1_PMU_PERFCTR_CORE_ACTIVE_CYCLE = 0x2, @@ -684,6 +790,12 @@ static int a7_pmu_get_event_idx(struct pmu_hw_events *cpuc, return apple_pmu_get_event_idx(cpuc, event, a7_pmu_event_affinity); } +static int a8_pmu_get_event_idx(struct pmu_hw_events *cpuc, + struct perf_event *event) +{ + return apple_pmu_get_event_idx(cpuc, event, a8_pmu_event_affinity); +} + static int m1_pmu_get_event_idx(struct pmu_hw_events *cpuc, struct perf_event *event) { @@ -862,6 +974,17 @@ static int a7_pmu_cyclone_init(struct arm_pmu *cpu_pmu) return apple_pmu_init(cpu_pmu, A7_PMU_NR_COUNTERS); } +static int a8_pmu_typhoon_init(struct arm_pmu *cpu_pmu) +{ + cpu_pmu->name = "apple_typhoon_pmu"; + cpu_pmu->get_event_idx = a8_pmu_get_event_idx; + cpu_pmu->map_event = m1_pmu_map_event; + cpu_pmu->reset = a7_pmu_reset; + cpu_pmu->start = a7_pmu_start; + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &m1_pmu_events_attr_group; + return apple_pmu_init(cpu_pmu, A7_PMU_NR_COUNTERS); +} + static int m1_pmu_ice_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name = "apple_icestorm_pmu"; @@ -911,6 +1034,7 @@ static const struct of_device_id m1_pmu_of_device_ids[] = { { .compatible = "apple,blizzard-pmu", .data = m2_pmu_blizzard_init, }, { .compatible = "apple,icestorm-pmu", .data = m1_pmu_ice_init, }, { .compatible = "apple,firestorm-pmu", .data = m1_pmu_fire_init, }, + { .compatible = "apple,typhoon-pmu", .data = a8_pmu_typhoon_init, }, { .compatible = "apple,cyclone-pmu", .data = a7_pmu_cyclone_init, }, { }, }; -- 2.52.0