[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240529080358.703784-2-xu.yang_2@nxp.com>
Date: Wed, 29 May 2024 16:03:52 +0800
From: Xu Yang <xu.yang_2@....com>
To: frank.li@....com,
will@...nel.org,
mark.rutland@....com,
robh+dt@...nel.org,
krzysztof.kozlowski+dt@...aro.org,
conor+dt@...nel.org,
shawnguo@...nel.org,
s.hauer@...gutronix.de,
kernel@...gutronix.de,
festevam@...il.com,
john.g.garry@...cle.com,
jolsa@...nel.org,
namhyung@...nel.org,
irogers@...gle.com
Cc: mike.leach@...aro.org,
peterz@...radead.org,
mingo@...hat.com,
acme@...nel.org,
alexander.shishkin@...ux.intel.com,
adrian.hunter@...el.com,
linux-arm-kernel@...ts.infradead.org,
devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-perf-users@...r.kernel.org,
imx@...ts.linux.dev
Subject: [PATCH v12 2/8] perf: imx_perf: add macro definitions for parsing config attr
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@....com>
Signed-off-by: Xu Yang <xu.yang_2@....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
Powered by blists - more mailing lists