Received-SPF: pass (google.com: domain of linux-kernel+bounces-144567-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 v10 2/8] perf: imx_perf: add macro definitions for parsing config attr
Date: Mon, 15 Apr 2024 14:13:14 +0800
Message-Id: <20240415061320.3948707-2-xu.yang_2@nxp.com>
In-Reply-To: <20240415061320.3948707-1-xu.yang_2@nxp.com>
References: <20240415061320.3948707-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?fsIP6F84A7H9ylWITCzHLn6m5zV28GO3PWUlbvqw9a6sh6n9ozmwvmwBilB/?=
 =?us-ascii?Q?KkqBZbKnnSYRclcwlv8mfmUSsT6wPVnW5aFzGzoXoaJ7L8gPuYktwT2jem62?=
 =?us-ascii?Q?o80tw9vI631uIGV7bqljoZgCNOV0X5U5eEhaH9gPPEGYgCFOE7McJm9wQjph?=
 =?us-ascii?Q?ZX0pRUChGZh/kLWIJS0Cu4REkFWpjzpvPhnVMnPmR03/AQbypVllAxfL86Bq?=
 =?us-ascii?Q?TLm5JaWvzBDrn2tO8jiH1lHnyCr9iFjXGerqpAaeV/EHtEhSeItJt7wi/ckR?=
 =?us-ascii?Q?26+jO3EWDsPYunhotb/2zO0acivTmW03pBWD4P7Jvt885CLSQlXI8gYTe5We?=
 =?us-ascii?Q?pRhhodaPc9sfCM/D//IgRWj/Kp+6xiwOwzsRKqLLaH1eTNI7ljcImK5x9cZ1?=
 =?us-ascii?Q?YezV2q3UySvMDqSrzaWGRtEl0r2ICd+/6L72uX6GHgnWPbGWN1CbUAbnAFkf?=
 =?us-ascii?Q?vq4HFKi0rMWZqEryiuCmgJGji+Ayiool4DC3+ghe1LugERIOb9Z7uqEnUhar?=
 =?us-ascii?Q?5kYCQ59srmEu5ks2W/gWQYO2JlouZorWHuwxRf1eEABNiM2BTEyYg4xxwzEn?=
 =?us-ascii?Q?4GzYYCV8ISdwJjAnJCcl5udk7uisAXGhyhxEB20qc74TfnNYNaFMk0jG5Ybu?=
 =?us-ascii?Q?GevCPRY23fh9iarLW6M/WYACtKBOKr5UThlBYK+Ss16/Tl0tCWz/VQH5Ut9T?=
 =?us-ascii?Q?AH7k51GHf44C02ifSdaYhIyPwtCOIieJBPHgldJknIKTRSsEu0WuP+gNVpAO?=
 =?us-ascii?Q?o4XsYWZMyZRbpT3PvdPg8fueU3gMENGxppDwShTKxLPK3a1ko/Qs2IdWPz38?=
 =?us-ascii?Q?y3zCl8SjpqMeGDfJtH1KVVtFvKiOp38TFgeQUpfa7AI00NrFO2nybDVwc0eG?=
 =?us-ascii?Q?Z8/NIKCWjHoOr5oqwShO/dkwIgpl6GQW6BYvhMVc59ybKnEtRIMHMYmhOwAF?=
 =?us-ascii?Q?OcOB5Z+B3HLw83Ma9AcVKi+FSXYVE0EfpOeQ9JxYoHuPS7bCQGC8+R2sqXcF?=
 =?us-ascii?Q?Qq4rRbsT+1AuYnUOOAb7gQhXwyQCd9dQuT9q+iQb/++GlqzGWZNSi0PQw8b2?=
 =?us-ascii?Q?yhMdCrw2/kUsu6tqelp3zcp2JUFLcABJVZZ/KpsoOuFtpgcci/wjAmkxWeR4?=
 =?us-ascii?Q?iC/yNmg1SAzT/zrEhOZqC2GR1Pfi19MFRvaOrcNpmCdjM++bvlJruUvP0lg5?=
 =?us-ascii?Q?zsEmtLqfHxOvlOm4k5Qo+BngyKuRp7zi4TrkwpgtB3nriZztD27WYK/yA6a4?=
 =?us-ascii?Q?fgeEymFuBMOxF9AQf4O5BBeqBn2PVINiQ/bkjEOruQllqyswt2pv4Q0BFltY?=
 =?us-ascii?Q?TGp4O6OQ7irrTwrWYmaLtEgQT/p0FSuVaqoCPjXip2ULum7oehn0xY9mwzeX?=
 =?us-ascii?Q?9abxK07IPdwWXN8RYQhwZXmoxASt2/+EzXSafUrrTZ3oJDzzXTP8R3Xqc/LE?=
 =?us-ascii?Q?dJY9NpHQAVql8Aw41XjOxmflxr2SF+nc3MjBC9u7GiqqVtvYHEgjcHKZwv+1?=
 =?us-ascii?Q?KSIk194NNFRURNiaGhCNKiOxxActdFNQMgzABRq1hmMiNIzv8KbQoTmypTmj?=
 =?us-ascii?Q?dWlh/Hikr/rIjZHwaPKgXxXHSgYuvEg1XZBsN53Q?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e7171888-a8ea-44a8-4fb7-08dc5d131517
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2024 06:12:52.1420
 (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: l372IqxOrdMejBN7y3BrLbOyB7xS2Jwuo6kGNEtClp36v9R0V4SgCRntvxaXBoOnc+RL/yvXFnm6RDj7yvB7rA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR04MB10117

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
---
 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