| Message ID | 20240315095555.2628684-2-xu.yang_2@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v7,1/8] dt-bindings: perf: fsl-imx-ddr: Add i.MX95 compatible | expand |
On Fri, Mar 15, 2024 at 05:55:49PM +0800, Xu Yang wrote: > 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> Reviewed-by: Frank Li <Frank.Li@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 >
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++;
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(-)