From nobody Sun Oct 5 01:46:26 2025 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 5484E1EF09D; Mon, 11 Aug 2025 13:56:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754920565; cv=none; b=efveHFdAEluY9n+jchWZkkKf8Ja72UWBYu8y7ETwqmSID+qb5lZaMFxITqCIRQzGpIxmPgZNxeoFoZswgadJ5rv1GN91Qqi2O6Ew/doRHzsy0tqqrTBKkvFVQwznLNw7BvSxPYymy0zqlgP9ligCV9Bl0xCupF4UJivbAqFFMPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754920565; c=relaxed/simple; bh=pymodVDjkymPU76ZXTw5IlzwIXD4zHyf40Nqmh2xgvg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=InQXA6THupPcf4DSDuLE05qOrAkv1wE7e4q4aPS/UXCMDbu1MnwueMAlaa7Oo4R8uLCzbcZWQ4sUaDtQt31BvPIfzJ+0iadyvbouhclAB3ovzqHiEr9hGwMPK5bOyYFKWBF9/WMd8aerDG4SCHPEGkIyEPktnmwWbTP/JNnwrHw= 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=XK5O26Iv; arc=none smtp.client-ip=209.85.215.172 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="XK5O26Iv" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-b26f7d2c1f1so4679724a12.0; Mon, 11 Aug 2025 06:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754920563; x=1755525363; 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=2gg5UVuWOzPTw0+Yp6bGNOgFO7/Q6MtealwLeE/ONWM=; b=XK5O26IvaZ50r07rYSyJ0CTqHXI2WSANA8BfPCnKH1OwLjsN4X4uZSG9S8d9GqNvxN CfrojKsHvYp+HvIipDN9cbQx036Rvwu6/x1X1iIvghLm8RzvNFkGZFu+k7qa0mUm2ZA8 OI/4/5Nznd3wFq8RNEqs7szS8IDjI/XdXnk/7EtTtuDa7d3engRB6I0Vdc5FgQXPoJHo yEbksQ6Cz3Lbi+bj90I7UxcUBkTK5C7VIB/5ubZh4g8rvA8IkCt6gqUpBhpNH9qFEm9P SBbkZV/3bL3VCCF+CA+9mMeGaVv6ap3oWWCPeliKLLkuFGzByy95moPaHHe+e4JbcdIR Br5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754920563; x=1755525363; 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=2gg5UVuWOzPTw0+Yp6bGNOgFO7/Q6MtealwLeE/ONWM=; b=w1dO64IlvArcQQ7G+/SBfm0vxZR9ZIiFXT3z3PMfGR/2Ng2DGlWq9QDDUmAf//zepn lSLsgMC+NSPfhMv1KeodjbBN3gO8fpA1mLVSBEUnvdEYUA4ar76D6d3wmI03XDO/uZDd TmS6xwamYZzHgj1aHNC4fTUW41sKG/0ovPs4+04zjxd4WmKBZUIUHBQyetJAiXknurQy eRuAQajURhqabvSadr4iPy/bobtv59z6dRyK/Lusgi0PnXzl8GBYsuKUA+K2JNJNy/GK 5l1WsFQSEUROZnfHMIPALzojgdt/q+nUlkGM+Qqu5SPHqaj2zXQWlA5ycdejY+Zep05g lotw== X-Forwarded-Encrypted: i=1; AJvYcCUQERYiB8vmxAHC/7avHLy5j9QN4kUGu0BfmHNEaEruKvOifJgbWoioQwWsTK5PNxol1l5exhB9/0SrrTaj@vger.kernel.org, AJvYcCVytByxsl6yiex/Q16Ojwsz+hNZ2WGWOyjU8z6rKeGDtafOKrvA6ChUT2blBRI7uQPDZ9vpzF4r79o5@vger.kernel.org, AJvYcCXwdHZG3V0tBlUSzPIjnz6AK0TZ50kD06JrQIm6dpyNHqV17gyLpe1zj4JzsGAmAfGhc7c0s6nMsxOSKkUD9UpQsA==@vger.kernel.org X-Gm-Message-State: AOJu0YwHCiXzzDVnNdotUGVC2dUAfuAHi5uzCqZBfhI/hncWR9yp2rqO Oie8swHYsZsfB9jVByC1AqGfa40GxdE5keqoq8q/Mj1nT2FasVsg1DAG X-Gm-Gg: ASbGncu1x1q+L+fYeo88At76LX4VUVaoIGS04Tz5AY8cvQI+zzJN8RpyEzcmw5aTJ4i 5NYC2vn1g3ddKiCqQWMFXLBlZJPcEnUHmFx3YBLR5mDCKuhNucBae8KHHlqaA1TTSrS2OODNBCe GXQMSby1uAvJiGCIdgWv1dcevPNRMCSl34cLjrAE3u8/SAF/FYMskwwxh47xdseRrxqspsdN+A4 wMr/RxGYh5RXQH6B+o+VwlIUhNicP9GxYb4J5BNDZ/fQuAb+EMYOW5ANoqKeL+dCrSwsO6Rs3LN me/4Ca6JccYtXcF0rojTN/fq6obja3Ji8WVqz/tIWxtZuJfLKwgWFTGKcDHuTuYnVb4XZ5IIQnL +EFChgEpqSkusJkuitJz/CB2W3NDecELN160OheSFVETKduY= X-Google-Smtp-Source: AGHT+IEA7OXKVzEY/1bQxO5YnKEpClPmcwVSvF4QMURGYAGK5p0rGv6V/6+ZWrP5fH5fsLXbMh7OVg== X-Received: by 2002:a17:90b:390b:b0:31f:42e8:a8a8 with SMTP id 98e67ed59e1d1-321839fdeeemr19964134a91.12.1754920563221; Mon, 11 Aug 2025 06:56:03 -0700 (PDT) Received: from [127.0.1.1] (061092221177.ctinets.com. [61.92.221.177]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-b422bb1133fsm23585496a12.56.2025.08.11.06.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Aug 2025 06:56:02 -0700 (PDT) From: Nick Chan Date: Mon, 11 Aug 2025 21:54:41 +0800 Subject: [PATCH v8 09/21] drivers/perf: apple_m1: Add Apple A8/A8X support 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: <20250811-apple-cpmu-v8-9-c560ebd9ca46@gmail.com> References: <20250811-apple-cpmu-v8-0-c560ebd9ca46@gmail.com> In-Reply-To: <20250811-apple-cpmu-v8-0-c560ebd9ca46@gmail.com> To: Will Deacon , Mark Rutland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Catalin Marinas , Janne Grunau , Alyssa Rosenzweig , 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=pymodVDjkymPU76ZXTw5IlzwIXD4zHyf40Nqmh2xgvg=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBomfZCk9q7xCDfJfHyIhHmrzPcKLWCM4sEUP9ny RZcIOvQ8BWJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaJn2QgAKCRABygi3psUI JJc1EACthBI9pB7MbMAQ77EjqRD9DESUe88v3f1lQ7fJxO8ZC6W5O+cy7MbnNviP4isZRLzR17L GxvgHm2VGdAROVsjB8YteDkSM1/dcNtBUUjMXv1HaYzoWa+4cue3gRa4ZndNLrUxmK2Ne9hAtoN pxIgu3t7dr2sBj8CqpLBSIJlnL0dNq9Ti8ePwZ4cZ9HhnvfckVFbH0EIanY8teS5m3lypCAZ8fP FGeW7BDKB5aXuoc6nv0GbFO+5qNZFxbgM6zNGPdQzx9PxQecb6BG6G2u/YkUW4izGhAY3xmFjH2 jG9gNn2bE+eMyeRq6Lut6nBEqXCCyR182wIJGXVt21PRvlLdhUoRtVhOo9Qlx0zpy0UMeJ7lDXT SPbbzFW/xYu4dZSbI21LqhYrHGqgUngRDKf52NZdeKW2/rexo7Z2cWc6L6vMdFoqyUksqHnc4WA x0css5LfEmpifUcVK95X7zQZzMU00cyjap7oN1h//J6LRNDRvqbIgIO+eTVvSVQlLTQQ5vDSszr 5HXwhpOf7NcZt8757Z85P74WsCGpEfBex2LiCumZEabmL+Ylg+gG8NqW43TjCtrpXoZIswS2v2R lpoa0KVaf5MwV0Xxq5TrCDSsZ0GUMKGeuUeTyhlLGiizwE0IaZeqpplibNmy5D6QITKrKM6tH5Y MgDadfxsR/XJs3g== 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_pm= u.c index afcf7c951379698ceff21c1a99cca31b3a6177b1..a95f4b717857b30284470487827= 954dd4b139010 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)) =20 /* @@ -183,6 +184,111 @@ static const u16 a7_pmu_event_affinity[A7_PMU_PERFCTR= _LAST + 1] =3D { [A7_PMU_PERFCTR_UNKNOWN_fd] =3D ONLY_2_4_6, }; =20 +enum a8_pmu_events { + A8_PMU_PERFCTR_UNKNOWN_1 =3D 0x1, + A8_PMU_PERFCTR_CORE_ACTIVE_CYCLE =3D 0x2, + A8_PMU_PERFCTR_L2_TLB_MISS_INSTRUCTION =3D 0xa, + A8_PMU_PERFCTR_L2_TLB_MISS_DATA =3D 0xb, + A8_PMU_PERFCTR_BIU_UPSTREAM_CYCLE =3D 0x13, + A8_PMU_PERFCTR_BIU_DOWNSTREAM_CYCLE =3D 0x14, + A8_PMU_PERFCTR_L2C_AGENT_LD =3D 0x1a, + A8_PMU_PERFCTR_L2C_AGENT_LD_MISS =3D 0x1b, + A8_PMU_PERFCTR_L2C_AGENT_ST =3D 0x1c, + A8_PMU_PERFCTR_L2C_AGENT_ST_MISS =3D 0x1d, + A8_PMU_PERFCTR_SCHEDULE_UOP =3D 0x52, + A8_PMU_PERFCTR_MAP_REWIND =3D 0x75, + A8_PMU_PERFCTR_MAP_STALL =3D 0x76, + A8_PMU_PERFCTR_MAP_INT_UOP =3D 0x7b, + A8_PMU_PERFCTR_MAP_LDST_UOP =3D 0x7c, + A8_PMU_PERFCTR_MAP_SIMD_UOP =3D 0x7d, + A8_PMU_PERFCTR_FLUSH_RESTART_OTHER_NONSPEC =3D 0x84, + A8_PMU_PERFCTR_INST_A32 =3D 0x8a, + A8_PMU_PERFCTR_INST_T32 =3D 0x8b, + A8_PMU_PERFCTR_INST_ALL =3D 0x8c, + A8_PMU_PERFCTR_INST_BRANCH =3D 0x8d, + A8_PMU_PERFCTR_INST_BRANCH_CALL =3D 0x8e, + A8_PMU_PERFCTR_INST_BRANCH_RET =3D 0x8f, + A8_PMU_PERFCTR_INST_BRANCH_TAKEN =3D 0x90, + A8_PMU_PERFCTR_INST_BRANCH_INDIR =3D 0x93, + A8_PMU_PERFCTR_INST_BRANCH_COND =3D 0x94, + A8_PMU_PERFCTR_INST_INT_LD =3D 0x95, + A8_PMU_PERFCTR_INST_INT_ST =3D 0x96, + A8_PMU_PERFCTR_INST_INT_ALU =3D 0x97, + A8_PMU_PERFCTR_INST_SIMD_LD =3D 0x98, + A8_PMU_PERFCTR_INST_SIMD_ST =3D 0x99, + A8_PMU_PERFCTR_INST_SIMD_ALU =3D 0x9a, + A8_PMU_PERFCTR_INST_LDST =3D 0x9b, + A8_PMU_PERFCTR_UNKNOWN_9c =3D 0x9c, + A8_PMU_PERFCTR_UNKNOWN_9f =3D 0x9f, + A8_PMU_PERFCTR_L1D_TLB_ACCESS =3D 0xa0, + A8_PMU_PERFCTR_L1D_TLB_MISS =3D 0xa1, + A8_PMU_PERFCTR_L1D_CACHE_MISS_ST =3D 0xa2, + A8_PMU_PERFCTR_L1D_CACHE_MISS_LD =3D 0xa3, + A8_PMU_PERFCTR_LD_UNIT_UOP =3D 0xa6, + A8_PMU_PERFCTR_ST_UNIT_UOP =3D 0xa7, + A8_PMU_PERFCTR_L1D_CACHE_WRITEBACK =3D 0xa8, + A8_PMU_PERFCTR_LDST_X64_UOP =3D 0xb1, + A8_PMU_PERFCTR_L1D_CACHE_MISS_LD_NONSPEC =3D 0xbf, + A8_PMU_PERFCTR_L1D_CACHE_MISS_ST_NONSPEC =3D 0xc0, + A8_PMU_PERFCTR_L1D_TLB_MISS_NONSPEC =3D 0xc1, + A8_PMU_PERFCTR_ST_MEMORY_ORDER_VIOLATION_NONSPEC =3D 0xc4, + A8_PMU_PERFCTR_BRANCH_COND_MISPRED_NONSPEC =3D 0xc5, + A8_PMU_PERFCTR_BRANCH_INDIR_MISPRED_NONSPEC =3D 0xc6, + A8_PMU_PERFCTR_BRANCH_RET_INDIR_MISPRED_NONSPEC =3D 0xc8, + A8_PMU_PERFCTR_BRANCH_CALL_INDIR_MISPRED_NONSPEC =3D 0xca, + A8_PMU_PERFCTR_BRANCH_MISPRED_NONSPEC =3D 0xcb, + A8_PMU_PERFCTR_FED_IC_MISS_DEMAND =3D 0xd3, + A8_PMU_PERFCTR_L1I_TLB_MISS_DEMAND =3D 0xd4, + A8_PMU_PERFCTR_FETCH_RESTART =3D 0xde, + A8_PMU_PERFCTR_UNKNOWN_f5 =3D 0xf5, + A8_PMU_PERFCTR_UNKNOWN_f6 =3D 0xf6, + A8_PMU_PERFCTR_UNKNOWN_f7 =3D 0xf7, + A8_PMU_PERFCTR_LAST =3D 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 =3D BIT(8), + A8_PMU_CFG_COUNT_KERNEL =3D BIT(9), +}; + +static const u16 a8_pmu_event_affinity[A8_PMU_PERFCTR_LAST + 1] =3D { + [0 ... A8_PMU_PERFCTR_LAST] =3D ANY_BUT_0_1, + [A8_PMU_PERFCTR_UNKNOWN_1] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_CORE_ACTIVE_CYCLE] =3D ANY_BUT_0_1 | BIT(0), + [A8_PMU_PERFCTR_INST_A32] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_T32] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_ALL] =3D BIT(7) | BIT(1), + [A8_PMU_PERFCTR_INST_BRANCH] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_CALL] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_RET] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_TAKEN] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_INDIR] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_BRANCH_COND] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_LD] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_ST] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_INT_ALU] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_LD] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_ST] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_SIMD_ALU] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_INST_LDST] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_9c] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_9f] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_CACHE_MISS_LD_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_CACHE_MISS_ST_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_L1D_TLB_MISS_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_ST_MEMORY_ORDER_VIOLATION_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_COND_MISPRED_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_INDIR_MISPRED_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_RET_INDIR_MISPRED_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_CALL_INDIR_MISPRED_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_BRANCH_MISPRED_NONSPEC] =3D ONLY_5_6_7, + [A8_PMU_PERFCTR_UNKNOWN_f5] =3D ANY_BUT_0_1, + [A8_PMU_PERFCTR_UNKNOWN_f6] =3D ONLY_3_5_7, + [A8_PMU_PERFCTR_UNKNOWN_f7] =3D ONLY_3_5_7, +}; + enum m1_pmu_events { M1_PMU_PERFCTR_RETIRE_UOP =3D 0x1, M1_PMU_PERFCTR_CORE_ACTIVE_CYCLE =3D 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); } =20 +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); } =20 +static int a8_pmu_typhoon_init(struct arm_pmu *cpu_pmu) +{ + cpu_pmu->name =3D "apple_typhoon_pmu"; + cpu_pmu->get_event_idx =3D a8_pmu_get_event_idx; + cpu_pmu->map_event =3D m1_pmu_map_event; + cpu_pmu->reset =3D a7_pmu_reset; + cpu_pmu->start =3D a7_pmu_start; + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =3D &m1_pmu_events_attr_gr= oup; + return apple_pmu_init(cpu_pmu, A7_PMU_NR_COUNTERS); +} + static int m1_pmu_ice_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name =3D "apple_icestorm_pmu"; @@ -911,6 +1034,7 @@ static const struct of_device_id m1_pmu_of_device_ids[= ] =3D { { .compatible =3D "apple,blizzard-pmu", .data =3D m2_pmu_blizzard_init, }, { .compatible =3D "apple,icestorm-pmu", .data =3D m1_pmu_ice_init, }, { .compatible =3D "apple,firestorm-pmu", .data =3D m1_pmu_fire_init, }, + { .compatible =3D "apple,typhoon-pmu", .data =3D a8_pmu_typhoon_init, }, { .compatible =3D "apple,cyclone-pmu", .data =3D a7_pmu_cyclone_init, }, { }, }; --=20 2.50.1