From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 33131275112; Tue, 29 Apr 2025 03:44:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745898251; cv=none; b=BvF2gFhuhWZYDzJfxG31dz9tPHsVhjUFA0oGtbNtI9BtqpZ3jCSImVnvbZw6jm4iJaFO+O8orUAxcQpQMQ1UjcWHtUidnBhKbNmFl1OdRQXkMwHDjLeZj0YIaCG2qqhzaGVJwTdlJrKmLDWhLe3nSTjQKicTXuWC703yTvcXtMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745898251; c=relaxed/simple; bh=W4HZa+NpM2ESOXzUAr4zGaMv7Cw7ppma9xh4UBE8JRI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=krK1UyLzOmf0+Kw5d1AoxaaO5oIcIW0HwfF2BV34nj0hmj8xFx2QHRbZSGzbE05A/jg7YH5B0Pc0TCkZCm/joIZW5pMPKRd6L9ipcXSm11KUHh0p4Y/EtcDGwV/3zeZYJk+uwfPG6EQGbuoiQm5AhsyoxFwP0+KiRnXz8nAqsF4= 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=OjkAUQR8; arc=none smtp.client-ip=209.85.215.182 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="OjkAUQR8" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-af590aea813so6249979a12.0; Mon, 28 Apr 2025 20:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745898248; x=1746503048; 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=mlLudR/sWk/Kne4yinSxqoxYxOt3q1pcjfuUzQsQpng=; b=OjkAUQR8tsDjkAT3kZMshit+a8a6+qFCo0dvInzbzoE/0/926JLrT2KYtV4X5RFKxv qiGCgiTC+uu7E/dvzkwVdQo7GmVwL/aqfVms5cUnAeLR03fAPcl8uo2BjOZpa5q/kRtd b5nidVr/WZfREXmKYoe0PszjPnugTlAYi2N/9N/zbjrayDH7yN4q6JFPlqYxavWtcgFd Qmo8d5Ng3ZEkOIqVbzrlllLEq6J/+JYzO+rzTfAnZsO7fpL4FNKt7cEoliczc8+VPxV4 O9Jh7NoF1iOljXm0dV81id0z1wd40Dbg7quyjD69zcN5pkXAQFiPAD6wK+E7VbEczpnM TblA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745898248; x=1746503048; 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=mlLudR/sWk/Kne4yinSxqoxYxOt3q1pcjfuUzQsQpng=; b=gdZ9OsHhoY97TBPCN4nkm+DxejFAGQqhUv3K8dnBtHNb3NlXU1MAhAR+EDE+d5ZXzL Nu+hwGpjbjQWDA8QW0uUYq4zwBUV97LAQuWgDHeCC0mDLCSxCI5c4Cpvb2aMwgqR8FkY GuIO7BKSd0fEZdq39p9tBZsq0Q11QncmA8jxEQIR/69c6gU7mWlWTTCHC+nG7R+jebYZ Dm5z0IUMbxUY2bIj20qzaRjIcQ4T8/NXgqenIspbxlLRXp5sZYAnP8k14mWlKxQWbsDD /5kQsuRwdb1jsicKBjZHMltlHSe/cRnWvsG2rEvmR0vBlMOGuyWUhJ7Hewu7wycqRLcJ ZsQA== X-Forwarded-Encrypted: i=1; AJvYcCUQInmJweE86B7949VbIVxxOybE2JsyPyI9LxwcDi/Qouhxyjf7woTE8iuUtO2dRsZ5OlX6NElSO6Zb/h0i@vger.kernel.org, AJvYcCV6b6ycfMZhd/Xfh5nCIx8zIC+MmsKWhb7SeocBOHpjVySycvZEptjCSTunCWzuQgMCZrYT7iWY4YfvjHIeut9wag==@vger.kernel.org, AJvYcCXqtwi2qkojoT2F6tXRYkpGwn9FDrty5ZoUVJqKh2QvsuDJBpGNjnFfpB0tsofmgLypT1aXYmmUUV8W@vger.kernel.org X-Gm-Message-State: AOJu0YzAStkIRJtMH44unA7rR7gnsV+z52377qzpUnBX29aEyzq6hGKK 86lxcCkqO4e6ZlilxUfAoJhYZKhACsi2p7KKQoFa41Mxf3QzfU4l X-Gm-Gg: ASbGncshyZrjTkRCUaal+Eb48vpjUNUFmmyimAbPjpjv+uSPO22R8lQPWHLZD9YXolg njZGO3h20SRJQXcvAxxL0QW1vq9uKrRsG0lK/YsNCA8tC8YEra+6TE7E1zWevXHoSbopVAPcwPu x7NcFLXciHV5rNqScV/3mH5VI8AssFBbsYKO0nuQIsREH40SGQwMk1UjRagaAp8EIvYYGyJ+VRI Dl95b2FYcWCs6mDFxh508opIzLZ6Fot7rFvnhlj36ogsEEV51JbGKXpUOtmeYhDG+0UXOza+RyC YebRfuzs+qkz5Ia4VzJW+XmMN9MwTNE6q6rMDQYj0S/uHD1G2+QrJK4FKg== X-Google-Smtp-Source: AGHT+IF+97c6t2V0U+Jsef2TbJdBXiCKapy5VWbM5YnbccDjuKcs6I3RQu3nEjQxciAhuCJyYEQr1w== X-Received: by 2002:a17:90a:d44f:b0:2ff:4a8d:74f9 with SMTP id 98e67ed59e1d1-30a2246ac12mr2195788a91.10.1745898248469; Mon, 28 Apr 2025 20:44:08 -0700 (PDT) Received: from [127.0.1.1] (wf121-134.ust.hk. [175.159.121.134]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-309ef03bb7fsm9953249a91.9.2025.04.28.20.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 20:44:08 -0700 (PDT) From: Nick Chan Date: Tue, 29 Apr 2025 11:42:33 +0800 Subject: [PATCH RESEND v6 09/21] drivers/perf: apple_m1: Add Apple A8/A8X support 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: <20250429-apple-cpmu-v6-9-ed21815f0c3f@gmail.com> References: <20250429-apple-cpmu-v6-0-ed21815f0c3f@gmail.com> In-Reply-To: <20250429-apple-cpmu-v6-0-ed21815f0c3f@gmail.com> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa 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=7313; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=W4HZa+NpM2ESOXzUAr4zGaMv7Cw7ppma9xh4UBE8JRI=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBoEErkrpWpQSCX/WqDqgyrcwt2S/fTgdh2zsLxq MPo+ysA+++JAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaBBK5AAKCRABygi3psUI JMb+EACEwp3lUqLLbKMkz+2c27n5snoNXQx3oIc7EDYlhgVmTQCvdB7tueEjMX0SyO5gHz7X95C THV1yvng0QqNbO1EVEnUHVz8M4f6TzUAZhm0gUHmljwLsGGTr7BuSl6FA9Gt/kq9mClVfXQpsaD +DOafVzm1xDr4g2RLFaocI8tw61jAN+U5xC6zIDwSLbZ19mIxzV2hyDnwGx4afa59GZeZe7UZpw PAyxFWp0hQGKHOPM7kTIaTcUosdZxQAamS5A+xFkFcRYn7VxJX8f+aSR2wcTDfKpn9I8btGyy7d 3KLqCUtCFosnwLHcHI3Cux+akEb3w+k4sJkkPyNK60rtKrISA3BHOcgrjbLYMs1NXC3B175QGJZ Xc9RAfJUTXHt1kCBWSR1ttM+omjeGxFvrw8Eo4eeOCkSW0zeQTmu1fTqi3pqpOCutONa9RZWzte VIVTlmUEVh3vVLFKLfgpaXrnCrMJHg0zZm8mftJ8iqZKEc3oJzjNhezgKlu4puSE35xgqjQwjBI jlJsdsValwI9E4HJiqBJ2EUGmHnyYsxv2yWGsJyI7RUMNcUogsofDPpy1NH5Zy12r3xpgkiu0ER NTvLmtCszdAsKF4Iun4WU20mJpLKr/dPH6wd88Nw5Ash1ZXGZtmXe7/WMXKYpwMZd67VHIS3dVm 78NXLvACEEq++Ug== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 Add support for the CPU PMU found on the Apple A8, A8X SoCs. 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 3c03d0e99ddaf90605cb8dafa68ab8770d371a05..5739a85f3ae07c52f4ce91c4eda3e4bcdf91015d 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, @@ -685,6 +791,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) { @@ -863,6 +975,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"; @@ -912,6 +1035,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.49.0