From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 6697024292B; Thu, 13 Feb 2025 14:36:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457407; cv=none; b=LlG1PMjsmf2m0aLlMh4c66ePv45DyyFZ2x4xXpVTqyHVI/t/QkXT3gPj6dfN4LW6CSSTCeDVKVK2vG1HenMGKJ4aVor+/30OipJgD7Sshc5Jq0eCqkoRCZJ0PirqMWLtdFun6ptxb7Fo7EfB3wYsGG95u+1kCbV21hH0Pt3nqcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457407; c=relaxed/simple; bh=UVC8FadMuB6VY/KmiveYBDZFYq6bqMSuynlpob5XKqw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OGSdK6vuD6QldWvzDHc26vXtlTIVoA5QJQN1H0SLb/9znBF1FpmeUOeN1XJNAxRjIBFetY9Od0lf1C8NW3asMiLyGzOGR+leYPakaqzaBpY1S5XXKLKd+igjECPpRMODKYkHZWyFL0BMi8pAKpelAsrH+t9UanPVIZiYYe0Zq78= 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=kNBstN3x; arc=none smtp.client-ip=209.85.216.41 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="kNBstN3x" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2fc20e0f0ceso604286a91.3; Thu, 13 Feb 2025 06:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739457405; x=1740062205; 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=4PQgnSNlrV+SdgwGhALUTLKMVn2ip32UhoYSUOE3cAQ=; b=kNBstN3xhccp10vvlu7hwfCe/JQZwUdr+2lvdX2J/Kmp2fvhBfU9UbMByDQ9NCBy5X eHKj4Udx/ih2vVR6VK6jDA/skQoimKyxjR/M/Y6z48OeZE9zVxmaor+0Jn2gkTLlvcJ9 LDqz18w9Rwh1uGbMSTfWjYMt+/Cg4e7y2A3nOd19TMPLE2Kn3HgVrVxD6mRRWmytXhlH 2ZoeB9c7N19vWcOJUEOcVsK3tpNqn14ruU9J3uV1TDYn8pXa7ek9cEFcQUPCflb0IFC4 5wAEKEvBEEdUnALfdRgUFeQHxs2UjaDNwapJevlxR9hkDuTnn6qnCJlWmCxfOA7NQYvE JAMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739457405; x=1740062205; 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=4PQgnSNlrV+SdgwGhALUTLKMVn2ip32UhoYSUOE3cAQ=; b=n1Rfv4GqnqofrOq7qAmwFeQAq334GO4g6FNS1vhvceVM7H46PtogNTfV0arzMCGl82 5CSIK1cm47Kj3se7m9+rJsnwgmHoeCwFAcVWPcspGkxSoyi+k6Tyle7LWolGzWKK0/as IM/1CV9QUZQGWdx3urwf1ppOrN+t+gfZGCN0ND5kpxti5qGBUKLiI1a9rTdE1eiB2k1H bzhKbllrmMRf3sypQMrBOgQttuONRgAr06nzjvB2A012i6u5tHlqpR6azuMhkVJP0he2 5WS6jHaUfnW9+QK6uISUtnYeWSq2BTFStZonQLsXnwIIHbveI7FX5KMUKDBdGfU07aGh SysQ== X-Forwarded-Encrypted: i=1; AJvYcCWESPyaMMAoAta2qvkXFe/csBWfwipsJgDxjFQMCBqVBh3h+ZQPKVCe6Ue+Zbr+HiYGy4a/ByhlGns2ivnDUyQBJA==@vger.kernel.org, AJvYcCWQwAormCHUATRSOqLsuKVyLCZ9evulCgm+POrXDk/CtvlCS26G5TZPY4TyHFb1MW8xzsc2O62RkWVAMg9T@vger.kernel.org, AJvYcCWeTVL1IvilSrXEaMgCf1jCZIdom9IVyGwXczAmD/ZHrXAq/QQfVrPGBVvZxwvBM8TOvYkuS8zRdgh1@vger.kernel.org X-Gm-Message-State: AOJu0Yw5b+p4oGS+Gf+r2IJBDq8Sq1Hi5fltkYcBE593tSUiHVEIjp0s se1D+Pak3og2ySFDbkCHLG74tQTPX9uLCvioaq8LMbzOlYkTCK+z X-Gm-Gg: ASbGnctVH1HWFcYoToD3x6xkr8BdS9NTWkNna8/8M4uJM6DGgXB0bclxgY2w+yfFLn4 fJTQlLM+Kh5PHXpvUpw2Sa0jEE9jgxZ+FzRmZ7LZbP8tKW9HuwtvyhhnDL7FKb+lnkgGh0txQHq U2Q/nRV3SZlyjboTiIqytgL8YAf1KW3VS66/jYSrRgQzQxKdLQ6Ac34HU05BAba4JhlI6gLn3v3 jo+6ig2bAU3Fy2bhFzS1crX6YQ0iiWUDVxwSyMhMwlsVcwVQ7s/mob7YHv/w4t7yVlhR8epKVsP DwFrrqEdbcxiQguLkw== X-Google-Smtp-Source: AGHT+IG2GDFhdjK1/AGhwvhuRX4ce/AyCuxYDNdhaWlMMrJiIQTMBsNgJLpPOUdth3mcDRkVwamw9g== X-Received: by 2002:a17:90b:2712:b0:2ee:741c:e9f4 with SMTP id 98e67ed59e1d1-2fbf5be0da2mr11127443a91.11.1739457404645; Thu, 13 Feb 2025 06:36:44 -0800 (PST) Received: from [127.0.1.1] ([59.188.211.160]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2fbf999b5b4sm3655165a91.30.2025.02.13.06.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 06:36:44 -0800 (PST) From: Nick Chan Date: Thu, 13 Feb 2025 22:36:09 +0800 Subject: [PATCH v3 07/10] 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: <20250213-apple-cpmu-v3-7-be7f8aded81f@gmail.com> References: <20250213-apple-cpmu-v3-0-be7f8aded81f@gmail.com> In-Reply-To: <20250213-apple-cpmu-v3-0-be7f8aded81f@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=7233; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=UVC8FadMuB6VY/KmiveYBDZFYq6bqMSuynlpob5XKqw=; b=owEBbQKS/ZANAwAIAQHKCLemxQgkAcsmYgBnrgNjs4m3NXEJCrYmGgNVH+xNjHsY2hU4nK9hQ uixrkl9w9aJAjMEAAEIAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCZ64DYwAKCRABygi3psUI JELCD/0cSNEt0ZpXfSmzwZVozQ8rwVn/vyBOf7w0vAhvfKx+6LL925DG88QI0eb0+LlMjLLgGZO U1Q/0aJ9Wi3xJeEVvXgQsyohukaqxz7MH0WS6oGGG0Wm6D/1/1HPY+c9V4mSQT3ETCtU0qmyuER 72QDo1PmaRRDPcifCOVgF8zjBFoMRyFwH0WKVCy92YX04MHAhBdtJTqF2Im/ynHmlu+EzJ1pHtq o02zh6kkotnmnIahTODbtgCtRVIGuBcbqBzpTysYb7e4GAru6yuB/FIALdl4d9kzd1naWFMAbzP zH9X8AlerVa1dWYOctGpcD+dN4BfcOM2Zyg87JVkx3nyPPph8FHVqhJY/UkuM8XhBFHkeZojhsB fEQPTJZEFhhgJDVBEtZNoPRqUec6hTKOwVRDXsWRzq4jnG7eGova1aa9ZU301dxTLlHrE68F2G9 Cwz2yP/lOB10e8ej9E+9JaguzLRnNW7FjQk7Swkxd6GlaXaVGZz+smg7JloGC3py5PWuJqPaDZK fdMH9ICqE9SqEe6aYYqZXQhliB6uoRGRCttvRkixvgG/L6/Q7I/GMzVsDOaDu2O7sEZZoUOagWu PogvgT+pEMNc3Uagap2WWmtLcxKhSEqcJScHMaiv88CcaFds7U8Khpz8usjJl0aSHf/FfpFbTHU JyGAFtRo/5XlzdA== 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 | 123 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index 1321d775d894ae94dea76d3461002de1c112a456..2f9ed8b2883913f67518484ae6f174a3d03b1f9a 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -27,6 +27,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)) /* @@ -182,6 +183,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, @@ -646,6 +752,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) { @@ -795,6 +907,16 @@ 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; + 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"; @@ -840,6 +962,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.48.1