Received-SPF: pass (google.com: domain of linux-kernel+bounces-191889-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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 v11 2/8] perf: imx_perf: add macro definitions for parsing config attr
Date: Wed, 29 May 2024 00:05:17 +0800
Message-Id: <20240528160523.1695953-2-xu.yang_2@nxp.com>
In-Reply-To: <20240528160523.1695953-1-xu.yang_2@nxp.com>
References: <20240528160523.1695953-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?bx6s5Btxxn0dCzFrfIgSLeFM4BZyVfbyVk4BvaK0JVXjLXvXa0/00MFwXhEc?=
 =?us-ascii?Q?0vyUuDfe46VDX/aErzydtEMpjKJ+QPERDiaFkhJx1zIrd2KBUAKK37iB2cbo?=
 =?us-ascii?Q?XsL4aMrIOrDX43muN4jBa+aU0AQUMcaogl78a+e+CboUHyKNaxYhcGhxQ9o7?=
 =?us-ascii?Q?kZXkCTX8haDOfLn4jTwLQpThdaE6uP0zXvZJ+MVA2o8DT017uaEdtFjxLJh9?=
 =?us-ascii?Q?gPEctBpSsOKIVVo4t3KTWLp1K1VF6SVeEASTrw6rtSQMUbf+G1/xu/DZgIHp?=
 =?us-ascii?Q?zqgTGnlvn4YRgqnHhvmZaVGFO+1u3TPvYu3u5AWVhBrLng9elmfjFcaeXojV?=
 =?us-ascii?Q?HucwmgX9fn7/iIxdMkYKHf7gQ19bybVbzvb/xbS7luEE/HxksRzlsu2MTpyl?=
 =?us-ascii?Q?erDuQvWGElXBWJrtG1a41q+OhdyXxxy4d+xmKkimAe6bcwc4LZBva8GbwjWQ?=
 =?us-ascii?Q?QK6AerSXvqDH/DszXBcmLK60I4O09nXx6sdUnCppL9tZYAxgxNirUnEJGPOs?=
 =?us-ascii?Q?r+gpW+HBO6XwmKbCW6ph9Nik0XmCDxbzYE7CNVqKlX20kT6DJprokLQuSTP+?=
 =?us-ascii?Q?zxmTUdhmwGLb1uSP+buIOooYTPoBlZTBlMfNhGJQq7+ZOkXRvb5NsorXeVGv?=
 =?us-ascii?Q?QVtlePE1BKvm1WylYp1zy+upPA0/1hJfUudVgujFz5r71VSDdD5vmy3/1mhr?=
 =?us-ascii?Q?dw9BExqU6I/QTYYxNkOGaiLymF8DdDZhtgcA7T47EqkhLThUo6SqWoW02Z6N?=
 =?us-ascii?Q?qme0rxCnHqPoKx2ng8mqN+KxHdhXo6LnXS9Adon1L/RXBjMfv9vPLjaFuKVf?=
 =?us-ascii?Q?JvZrwPgkPi6TmIHKs9m9AONn45p8/Dr6ctTKUYTBrUCzPMhcRnDEgorx2O/5?=
 =?us-ascii?Q?Ny8qRDLX915/n4E579koOXNtoLVRSQb55upGCQ0rCTAi/xtyqfUs9ubNLpv5?=
 =?us-ascii?Q?Hluem2NEWVRCEoTH4Oq/3hhU9SiR6oCfsU5vVCavR/H7xPHy/0oTfRIuXXa0?=
 =?us-ascii?Q?cT/jMM9vyWisIZHXDqYau0cs4Lrmfoh/uSHijsCKrH1LXOPKW+i4ZE5o7kGO?=
 =?us-ascii?Q?jnSgRsEMJ9qA3bGpEirgG/zUSuC3+JuTbDWvDJ8Spr92VnPS/2maCAdKliDp?=
 =?us-ascii?Q?Sxh/KrQPjKEVo7FfG6LhZMJjzAuTcX1pLGtUzbnn1N9p7DNzXLX8cMr/WExx?=
 =?us-ascii?Q?Kc3/YV1Y3gc4aZ2l/Oj5eDpIU+sZvXEjeRj+KrqxpemMpGR0DX9Lua2tLrrW?=
 =?us-ascii?Q?x9a1VjFZhtmlf/IDEfBysgtmVSj/a7odqfGU02EqFLQKlCX7qab5Zx0+gDGC?=
 =?us-ascii?Q?Rtm2dqs/sQyjQ71zwOoi6rdBekEpVektqWHSEtACt+DdqsA5SZi00g/Fu2+5?=
 =?us-ascii?Q?ybW2j3/A3vlBplmB7lW/tPMkeELBvOljcgyO9BiQVZG6Q8lOyCC5U5VTDGdH?=
 =?us-ascii?Q?a9Of55VyJr8UjGQYi8YpJHZ85FAhSms6QrhLQBQaonavCbqlUdgPwFNeiWJ7?=
 =?us-ascii?Q?H3eZl3EkCQD2SrK+JNUK1mDzWZDD4NqPeboP69Ado0yuIsCpvIz3cPxeS279?=
 =?us-ascii?Q?U4uIZjOVn3CKyxnYgW+r7xt6v5KAXysk9YrwS9jx?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2a20b8b7-22ee-4c5a-dbaf-08dc7eebd3a6
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 07:57:31.6035
 (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: ImBzFV7p/fH4L5iBAVNU1ZSLIlpPY0H9My7aWf1ENXGM6BYbXlC4eeCLwWskwDcUl9CzkjaS48yXPuQRxAb8JA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB10019

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
---
 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..0017f2c9ef91 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		GENMASK(7, 0)
+#define CONFIG_COUNTER		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, 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, cfg);
+	counter = FIELD_GET(CONFIG_COUNTER, 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, cfg);
 
 	pmu->events[counter] = event;
 	pmu->active_events++;
-- 
2.34.1