Received-SPF: pass (google.com: domain of linux-kernel+bounces-104223-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 v7 2/8] perf: imx_perf: add macro definitions for parsing config attr
Date: Fri, 15 Mar 2024 17:55:49 +0800
Message-Id: <20240315095555.2628684-2-xu.yang_2@nxp.com>
In-Reply-To: <20240315095555.2628684-1-xu.yang_2@nxp.com>
References: <20240315095555.2628684-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?Sd1n1wBIRsOyzoaHSOMU0+iZ1bRWrRxfUhzD9KApY2wBzhEG32Q7U8jVFmsN?=
 =?us-ascii?Q?+IMi9v88xgMTRTmtKr89axHSpN7/XjzprvLvtbwRRV+KRtyolP1Pk73/F46d?=
 =?us-ascii?Q?P+3yYCxvsgK3eeWM4sRNUfHRWdMQ/sdnMerqGj9mckibSVxdsKG19DpiyyXd?=
 =?us-ascii?Q?gPrgIMTH8BuG8yk02O9gb/idS6O+BOu4H8klZS6g7TDF78sjamnaITnrj2Wb?=
 =?us-ascii?Q?G3jzN3F0PK4sww4SU9KA7g7X8od5KytWqiuuRCRLTliYwpQKhqRCpKNg38qe?=
 =?us-ascii?Q?9IjYFBxqwqMly8qHiaqVR48FXSZURNFx/N7z9JRmgXmaqtBCPHuZGd0iS91/?=
 =?us-ascii?Q?fhn11vsBxPGkZheUOvCRH9zsdged4yVtWlb1fw5SiIQmHVsI+hNe+uh60X6J?=
 =?us-ascii?Q?l6UvU//FMa5IePEDMNC9yX9s/Fd9jVcOZor2IsUiPpZx1CFKkqH51rVuIKCq?=
 =?us-ascii?Q?MbpLyUUuI6inuVQ/4MPPX6eQ5fGUcrZ6BuGwEwQsMtAfwv1EHLcfDTs3IrfW?=
 =?us-ascii?Q?9fKOrbEJhwLX8AGboa9m1rd7jzULiPgt2E0WDQuBB+aiNpJh1dHbDUjBTFVE?=
 =?us-ascii?Q?IobaRm9xcuaUrYofuKjJ3RGHfYc6H+BVE/fNY8B3UA1xv3emyqS9VO8/fBuS?=
 =?us-ascii?Q?h4qjy+I3fi2diz+Ox4aUdU+xpN+kMIoACB2VmCdaaYwiSy4AhzQ/au16eyRA?=
 =?us-ascii?Q?AHP9ht0qU3b6r6k7ub9kVy3BphYqjRl2yBZeFJHFZpNPkznBPa3z26s+c9DJ?=
 =?us-ascii?Q?BzAaAq7pR3YTUUnHLHNXw1hLoO87az69IqsJS7gknUcuOVvTRrPsOKLkKDmK?=
 =?us-ascii?Q?xpmImkY7k4f9Kk/HOyqT+tuPS0KQMCjm/POYmr3CZ78yhDN76GiRjp8BL0gR?=
 =?us-ascii?Q?FG1UDoSqNWIgXsDgdy34u7VEdpdp6hZRpWucZ6Ad0xcK7J25BfWNJrU8zFZC?=
 =?us-ascii?Q?AwDa1u11OVHAse6moIjOVSSsIqzdE9XwwE3K9FF79tC+CYK6+f3VQ6nxQzCT?=
 =?us-ascii?Q?EkrvRa1xL1sD20I1FLf9AwpayzdttX8coK4weSN/ozz3lDJAZJ5p1lwrZnY0?=
 =?us-ascii?Q?073SYNryKS9bQf+nM+N+bWXXzefKpC1KtiFlsYEfzI8fP7IyZlbQ5LEv5hjH?=
 =?us-ascii?Q?TEsN9x/5PZVAUCMSn+mQeicddMTLlg4WORawvzC80IaXq8MbVIGYd+7uuYFM?=
 =?us-ascii?Q?f3E5YxcJB7BBQtU7Lma5VtWekj4xGCjUAmWPy1QWU+Q2RU3gf7IC4C7RNRip?=
 =?us-ascii?Q?nOOhDV2YK4oRDKQ2YSm8yhLqQEYvURmmMNcyCcwjrLjbB/2C0eTiQff/9nq0?=
 =?us-ascii?Q?jsIquHtBRkGEDey/93d6/h//olBqZGmuK2pDhA1CvmVCmzzq4Y0EFsGhV8XA?=
 =?us-ascii?Q?7QvO0reSp9SekwuDbMFdO3KEmYV0TRUS0RymNmvK0ryipNhJq3rx2xoL2mcp?=
 =?us-ascii?Q?RnpmqKQg4DJekmBVbps9GFLR78R+mDLCmj8USS8GwlTZaIwtD4bsPspr6ArV?=
 =?us-ascii?Q?8a4a3IE976TIMw4JTbpgQFfdQjEJ/NJZlkWyXqpOxTg499LQSwAGuGQmOZv8?=
 =?us-ascii?Q?dOHB4rx18nRSDY7ghDhQBqgw60JqvTElaCEVJS8x?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 50b38113-092d-495f-81b0-08dc44d61804
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2024 09:55:49.8222
 (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: f8+c5RGySY6UaoLoe7L9VbI7Vzok9gWyODTcqV7ZGfEMppJxvxGz/p6kpmxfQk0CC+dfHcbe092PvURsyAnqLg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7444

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.

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_*
---
 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 9685645bfe04..4ec70775d1f0 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