Received-SPF: pass (google.com: domain of linux-kernel+bounces-96354-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Ilkka Koskinen <ilkka@os.amperecomputing.com>
To: Robin Murphy <robin.murphy@arm.com>,
	Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	Jing Zhang <renyu.zj@linux.alibaba.com>,
	Ilkka Koskinen <ilkka@os.amperecomputing.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/2] perf/arm-cmn: Enable support for tertiary match group
Date: Thu,  7 Mar 2024 15:09:29 -0800
Message-ID: <20240307230929.6233-3-ilkka@os.amperecomputing.com>
In-Reply-To: <20240307230929.6233-1-ilkka@os.amperecomputing.com>
References: <20240307230929.6233-1-ilkka@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?9nvlRhMR1pricGk1g5+nC6ET+hQo8yN9gXsaQCMlYQfwzpEGr0qGmu25nAfK?=
 =?us-ascii?Q?RjEPZcqoWo/2upxBMiRidyN27+HWNDwaAuJkY3Sh9F7PR1CEXvm5IGShePfh?=
 =?us-ascii?Q?fC8lxzCVsnNHtOGoivf4WjwtD/hvJ9T0Xwm3Yk4+PgGBDZOApww2eVLf0Tiw?=
 =?us-ascii?Q?mL1lAPReYyM46gxH0cIwop1wC420d8ndorRqTtO/Emcs3Q2RkYY+LtLSewOw?=
 =?us-ascii?Q?lcF2c9YWFaxUIM3Rzj48Pd5cixG/3a4rZiFHDSjo8Cz0/hEBipA4EVUG3385?=
 =?us-ascii?Q?6BmaIBEJUa+e0MMVPalnJYAFUJ32vp7y29l/2PqyQssZv9SV3//vDuTwyPCe?=
 =?us-ascii?Q?Qfj+EKnbwkeYSxE/8jZYYho7y1PDEFRov0wm6o1mrEB/iPLo2mwpjT8EMPKc?=
 =?us-ascii?Q?EoreCh1M1gialF80XswJjSMAfdd5O0RRzeg22F3OsE/Yguf77VXW6a3Ggdk/?=
 =?us-ascii?Q?KfHv3btAnlch1BEQo7HFx5uxSyt0vErnvc4996caD8+kxp95xWQAix2XK40I?=
 =?us-ascii?Q?5X7XllFrQYRlAgUK9Z7TzJHksINrOfYkyMnnjKVtim1SW5WUkLqA6Y7bVqax?=
 =?us-ascii?Q?FDowCPOr4LsPLtJfKWvGPktUdCxAySrcC02oLnJbttskOOuS6qIi5CPbNLVD?=
 =?us-ascii?Q?P0Rgjufxy5BTyZkrcKLi38WnTmdEzOshjukQPEmyiLc+415jOfG7K3NxGB7p?=
 =?us-ascii?Q?mqoIJbOOOmMdSP/ghghqLP3Z0bnJoen6198GtXE56Lv0ITD6sFtA9KBXhPAV?=
 =?us-ascii?Q?0OtYM2jqhFLOZvPToePy6IS9FHvYMGNt69AwplZ7yyJyIgWRgTAyNx7YUbwP?=
 =?us-ascii?Q?g+DYJ40cRVQ7037MWzwYtm53azgwucyVq5Y9o5T7NGH8s9PdA3chQ8YNiowR?=
 =?us-ascii?Q?OvtjJzD2nr6eTST8wMhTjocnKH/WoLc8sXWn/MMIvIdt5F2wvajXpRaif+EU?=
 =?us-ascii?Q?dMavBkMyHcoHIgaaIT0vPSPIhD6BcueCm1dlqxMjlyHHVc+OxQc8PbY1Poua?=
 =?us-ascii?Q?g6xnmSqrtiSc/0Pov4glZIlIAu/PIpGECv7TSAk2CThQ9SBO+RCo65R8Sbbr?=
 =?us-ascii?Q?fGv5EgDQfD195iN/QKi/KV65p2CdLcp/stE4e/9+m81xCRV10Yg2DNU2eYvl?=
 =?us-ascii?Q?w7QJISeBr8Tgp1uceuv0I9qlwKtGfz/Qf4N3XmbxR/VT5FW7lA1uTJNqWyMv?=
 =?us-ascii?Q?+LFHFPURN5C9Zw9pvyXMPF31+d5t1H7MDRLH8Z6Su9D+h5FuZO7fAfUDuF1W?=
 =?us-ascii?Q?HPmshNy2WXDBj1AfNDbTC41ggaJ1H1R1J8Q/OB2dr62hrp8h65MqhFIMcPud?=
 =?us-ascii?Q?2lNcrekFuFKyuROZvxoHaE/xHtDK/7T5TQNyAI8db0Up6NHjDz9Ro0Zg7PvP?=
 =?us-ascii?Q?fjh4LfYsMyn0CBtQCO1CW+C0XLgg1bFUzDHZZs5hi1Rlo/x1WArYczorAMc+?=
 =?us-ascii?Q?wuNy7sov0/ihluZSinfp3AeK6Lxi++/ntjsva4ja6Ehc+QwASfpVkuXcVhWF?=
 =?us-ascii?Q?N46JHMiYunnlT4fTWAu28bLcYlsCNfzVhAueZE4xllDJH++fEUdFgJteD6ix?=
 =?us-ascii?Q?NbBPi0qkDePfPBybiB02sPLIgp34+J3kzkvPmaQ24FJ21O1eOWA4dugIRAL5?=
 =?us-ascii?Q?fsWervbOFTxMRjzqy75FGtQ=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ccb123db-7ca0-4f9d-b3b3-08dc3efbb9d6
X-MS-Exchange-CrossTenant-AuthSource: BL0PR01MB4226.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 23:10:05.7255
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: M/OLTt8qYmRLHp2ovRFi/AtIIxIRRn4okPTc5dQcHUNqv1G7Gg8dbv7sDpeyxRPwGPtiio0kCiQtcgPCj4PmLIWv0B5zs5XyyT2r1mD3bpqxjSXB8lO9+ZoIB+2KdWIm
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR01MB7116

Add support for tertiary match group.

Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
---
 drivers/perf/arm-cmn.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 29d46e0cf1cd..4a4cbda94907 100644
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -174,9 +174,8 @@
 #define CMN_CONFIG_WP_COMBINE		GENMASK_ULL(30, 27)
 #define CMN_CONFIG_WP_DEV_SEL		GENMASK_ULL(50, 48)
 #define CMN_CONFIG_WP_CHN_SEL		GENMASK_ULL(55, 51)
-/* Note that we don't yet support the tertiary match group on newer IPs */
-#define CMN_CONFIG_WP_GRP		BIT_ULL(56)
-#define CMN_CONFIG_WP_EXCLUSIVE		BIT_ULL(57)
+#define CMN_CONFIG_WP_GRP		GENMASK_ULL(57, 56)
+#define CMN_CONFIG_WP_EXCLUSIVE		BIT_ULL(58)
 #define CMN_CONFIG1_WP_VAL		GENMASK_ULL(63, 0)
 #define CMN_CONFIG2_WP_MASK		GENMASK_ULL(63, 0)
 
@@ -1389,7 +1388,7 @@ static void arm_cmn_claim_wp_idx(struct arm_cmn *cmn,
 	set_bit(2 * xp_idx + (wp_idx & 1), hw->wp_cfg);
 }
 
-static u32 arm_cmn_wp_config(struct perf_event *event)
+static u32 arm_cmn_wp_config(struct perf_event *event, int wp_idx)
 {
 	u32 config;
 	u32 dev = CMN_EVENT_WP_DEV_SEL(event);
@@ -1399,6 +1398,10 @@ static u32 arm_cmn_wp_config(struct perf_event *event)
 	u32 combine = CMN_EVENT_WP_COMBINE(event);
 	bool is_cmn600 = to_cmn(event->pmu)->part == PART_CMN600;
 
+	/* CMN-600 supports only primary and secondary matching groups */
+	if (is_cmn600)
+		grp &= 1;
+
 	config = FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_DEV_SEL, dev) |
 		 FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_CHN_SEL, chn) |
 		 FIELD_PREP(CMN_DTM_WPn_CONFIG_WP_GRP, grp) |
@@ -1406,7 +1409,9 @@ static u32 arm_cmn_wp_config(struct perf_event *event)
 	if (exc)
 		config |= is_cmn600 ? CMN600_WPn_CONFIG_WP_EXCLUSIVE :
 				      CMN_DTM_WPn_CONFIG_WP_EXCLUSIVE;
-	if (combine && !grp)
+
+	/*  wp_combine is available only on WP0 and WP2 */
+	if (combine && !(wp_idx & 0x1))
 		config |= is_cmn600 ? CMN600_WPn_CONFIG_WP_COMBINE :
 				      CMN_DTM_WPn_CONFIG_WP_COMBINE;
 	return config;
@@ -1919,12 +1924,14 @@ static int arm_cmn_event_add(struct perf_event *event, int flags)
 			input_sel = CMN__PMEVCNT0_INPUT_SEL_XP + dtm_idx;
 		} else if (type == CMN_TYPE_WP) {
 			int tmp, wp_idx;
-			u32 cfg = arm_cmn_wp_config(event);
+			u32 cfg;
 
 			wp_idx = arm_cmn_find_free_wp_idx(cmn, dtm, event);
 			if (wp_idx < 0)
 				goto free_dtms;
 
+			cfg = arm_cmn_wp_config(event, wp_idx);
+
 			tmp = dtm->wp_event[wp_idx ^ 1];
 			if (tmp >= 0 && CMN_EVENT_WP_COMBINE(event) !=
 					CMN_EVENT_WP_COMBINE(cmn->dtc[d].counters[tmp]))
-- 
2.43.2