Received-SPF: pass (google.com: domain of linux-kernel+bounces-193680-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Xu Yang <xu.yang_2@nxp.com>
To: frank.li@nxp.com,
	will@kernel.org,
	mark.rutland@arm.com,
	robh+dt@kernel.org,
	krzysztof.kozlowski+dt@linaro.org,
	conor+dt@kernel.org,
	shawnguo@kernel.org,
	s.hauer@pengutronix.de,
	kernel@pengutronix.de,
	festevam@gmail.com,
	john.g.garry@oracle.com,
	jolsa@kernel.org,
	namhyung@kernel.org,
	irogers@google.com
Cc: mike.leach@linaro.org,
	peterz@infradead.org,
	mingo@redhat.com,
	acme@kernel.org,
	alexander.shishkin@linux.intel.com,
	adrian.hunter@intel.com,
	linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-perf-users@vger.kernel.org,
	imx@lists.linux.dev
Subject: [PATCH v12 2/8] perf: imx_perf: add macro definitions for parsing config attr
Date: Wed, 29 May 2024 16:03:52 +0800
Message-Id: <20240529080358.703784-2-xu.yang_2@nxp.com>
In-Reply-To: <20240529080358.703784-1-xu.yang_2@nxp.com>
References: <20240529080358.703784-1-xu.yang_2@nxp.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?9P7BIuxPZ1cKhj/LoLPDxFuPvFIwXU7gnJgFZrLAsfNNtVgZAgKK3Zyq4xz2?=
 =?us-ascii?Q?AvjfGrrZAfoovgGl3MCzpXtMm6Y7HtPqp8lxtTZYysdHxyZNAaVlf/MIWDXU?=
 =?us-ascii?Q?F6DVKKT5xVLTibqVL8JQa/RFasog2buZzYimtOKUA39V0dhlABwOUvFz4L5Y?=
 =?us-ascii?Q?YbPJsy/u9j+cpc/vfDXofAP3KVLcqZtxm3jZQYMw+cvgrU6kFoy8EVWHXgsK?=
 =?us-ascii?Q?lJHx3YQzHZcGxvPMLaDddNtpy4xT8clMrwGvbbq6/sGqYMjygFCw+RpO01hy?=
 =?us-ascii?Q?4Cq+hHgcuN2YEGN5MdlbyI+Rw4bhkj/hisN6OUFBdGU82BTpBUaBpBRHqk76?=
 =?us-ascii?Q?kQBM1LnWeHDb+dpwcYxegCX31c+zBu/NgZGR4OVqeWBDTRsuxM8xmDiIp3Ce?=
 =?us-ascii?Q?/09oMD+N+bfqMr1tgMWwY4LKaph+YDY44E/2sOYgte4+vfFgwBNShraWSj/u?=
 =?us-ascii?Q?ogoqzxhzH9lN3zp90hGN8/+7iM9NbRWNlz6qW0d/pLw3+zFYQD7g1SUDj4ng?=
 =?us-ascii?Q?1Q+R8Gx3e8x03HCqKHfwZL/8dxl2WaZqcI13tpG8xcV4dWFZ/m0rUokIVWjB?=
 =?us-ascii?Q?DKtohtcW4gqkfiMbNNPsNUEXSHm/MZlyXg+T/2sRnIG1yRJ1tvwAIixY7Kjz?=
 =?us-ascii?Q?rjcDQ15uxjhc+IXpw1NU4tlup/Vvym2VWiH2NU0m2esHY50geksWwlL6M+Wm?=
 =?us-ascii?Q?jmNO2w4X1N2WlmTzJq/+NKUkv02WXUovC8OrQSjoeG5NtWAy6ee3Y+dQiEzr?=
 =?us-ascii?Q?kJ0rTwuHF6rnpvJPEB3Dq8WGtXDrnTzI3t5VTm688D5oCcYMuU6BRFp0GTu7?=
 =?us-ascii?Q?Au2TzPRJqc331hI3Nq8hcbqKiL1KDExmwpxFpGy1CbHlveijzimaTBpw39to?=
 =?us-ascii?Q?q0KjN+iWf0Dwvo7phKQJQwycFKKoe5HPMVoDWpWFYAUloTq9bn/1mM6Yq2zp?=
 =?us-ascii?Q?RqpQpdKJAa8P+eyr95Y2Pj7n5kSs/nRvJutsnGiG3leLOxNwdmjigsgGkruY?=
 =?us-ascii?Q?L27kqbotV2Ea8/QSt4OmFfOVDgk37hnVIiN00ke8/HpanTomuntCs0eji+2V?=
 =?us-ascii?Q?Q4Kw0XLekiFkjQT7eVayzPVDtSTgSPfw8ASc9hOmzOGN9PHoMuhzyPvsmNwC?=
 =?us-ascii?Q?rrmAh+AZIkhF9NyT/ARWbsZvqNZmweROWsf3KEWe72pnqRQfjqKRq8juCXHE?=
 =?us-ascii?Q?sycHQpd62GtqUvbtGplTG6xWXF5r4lNEpqxkVSVO+OpOB/O0IIw+A/EIsoJx?=
 =?us-ascii?Q?J62RwSR1+VEbTTwROnJ8LMDm1V5/otc4E0VNWlghH46VGe1woKgUET5LL62L?=
 =?us-ascii?Q?yW6bQmwZtMqYVjEhrRfEnpTx2nu4aAVk+biO79WzkRuhxAKZcI2B+zsMHHto?=
 =?us-ascii?Q?mse51ZTMuV8w1Ay24/dEO4jcVA4Dm8dMY896fOeIoS4HSyi/UWm+o9GETaAd?=
 =?us-ascii?Q?X1i7lC2JbtbG6d/0e6YiS1apY2ZIH9Lq0v2Zv5VuiFOlZsdtx5O30jLChTqg?=
 =?us-ascii?Q?PL1wNv0r2RvkD+OerhRFTv27CxyzlNbVmuX610cDjbtJ3Kp+2Q5Cr/rELXfD?=
 =?us-ascii?Q?VFqPfqMnJfMNDBH3oc1ZbICerVikys6WOw/g6dDp?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f7f1a1f5-b54d-4f40-c0b1-08dc7fb5fb40
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 08:04:37.2862
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oyTLCKZ7PhtsUEkA7TjIcjs1pBMleTuR3LodWfxLlH3skuTiC2Rsg1Czuly0619dA26cZmP3insWKTLzLWr1qg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9384

The user can set event and counter in cmdline and the driver need to parse
it using 'config' attr value. This will add macro definitions to avoid
hard-code in driver.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

---
Changes in v4:
 - new patch
Changes in v5:
 - move this patch earlier
Changes in v6:
 - no changes
Changes in v7:
 - use FIELD_*
Changes in v8:
 - add Rb tag
Changes in v9:
 - add Rb tag
Changes in v10:
 - no changes
Changes in v11:
 - no changes
Changes in v12:
 - rename CONFIG_EVENT/COUNTER to avoid conflict from Kbuild CONFIG_COUNTER
---
 drivers/perf/fsl_imx9_ddr_perf.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/perf/fsl_imx9_ddr_perf.c b/drivers/perf/fsl_imx9_ddr_perf.c
index 72c2d3074cde..c4caeab7a9be 100644
--- a/drivers/perf/fsl_imx9_ddr_perf.c
+++ b/drivers/perf/fsl_imx9_ddr_perf.c
@@ -42,6 +42,9 @@
 #define NUM_COUNTERS		11
 #define CYCLES_COUNTER		0
 
+#define CONFIG_EVENT_MASK	GENMASK(7, 0)
+#define CONFIG_COUNTER_MASK	GENMASK(15, 8)
+
 #define to_ddr_pmu(p)		container_of(p, struct ddr_pmu, pmu)
 
 #define DDR_PERF_DEV_NAME	"imx9_ddr"
@@ -339,8 +342,10 @@ static void ddr_perf_counter_local_config(struct ddr_pmu *pmu, int config,
 				    int counter, bool enable)
 {
 	u32 ctrl_a;
+	int event;
 
 	ctrl_a = readl_relaxed(pmu->base + PMLCA(counter));
+	event = FIELD_GET(CONFIG_EVENT_MASK, config);
 
 	if (enable) {
 		ctrl_a |= PMLCA_FC;
@@ -352,7 +357,7 @@ static void ddr_perf_counter_local_config(struct ddr_pmu *pmu, int config,
 		ctrl_a &= ~PMLCA_FC;
 		ctrl_a |= PMLCA_CE;
 		ctrl_a &= ~FIELD_PREP(PMLCA_EVENT, 0x7F);
-		ctrl_a |= FIELD_PREP(PMLCA_EVENT, (config & 0x000000FF));
+		ctrl_a |= FIELD_PREP(PMLCA_EVENT, event);
 		writel(ctrl_a, pmu->base + PMLCA(counter));
 	} else {
 		/* Freeze counter. */
@@ -366,8 +371,8 @@ static void ddr_perf_monitor_config(struct ddr_pmu *pmu, int cfg, int cfg1, int
 	u32 pmcfg1, pmcfg2;
 	int event, counter;
 
-	event = cfg & 0x000000FF;
-	counter = (cfg & 0x0000FF00) >> 8;
+	event = FIELD_GET(CONFIG_EVENT_MASK, cfg);
+	counter = FIELD_GET(CONFIG_COUNTER_MASK, cfg);
 
 	pmcfg1 = readl_relaxed(pmu->base + PMCFG1);
 
@@ -469,7 +474,7 @@ static int ddr_perf_event_add(struct perf_event *event, int flags)
 	int cfg2 = event->attr.config2;
 	int counter;
 
-	counter = (cfg & 0x0000FF00) >> 8;
+	counter = FIELD_GET(CONFIG_COUNTER_MASK, cfg);
 
 	pmu->events[counter] = event;
 	pmu->active_events++;
-- 
2.34.1