Received-SPF: pass (google.com: domain of linux-kernel+bounces-46711-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 31 Jan 2024 10:29:00 -0500
From: Frank Li <Frank.li@nxp.com>
To: Xu Yang <xu.yang_2@nxp.com>
Cc: 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, linux-imx@nxp.com,
	mike.leach@linaro.org, leo.yan@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: Re: [PATCH v4 3/6] perf: imx_perf: add support for i.MX95 platform
Message-ID: <ZbpnPKghnJCgLbOC@lizhi-Precision-Tower-5810>
References: <20240131055811.3035741-1-xu.yang_2@nxp.com>
 <20240131055811.3035741-3-xu.yang_2@nxp.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240131055811.3035741-3-xu.yang_2@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?x+kQU+QLul+l3AgDeQT8ak+w1GWjUaeIfHy0iN/Zuuc2mEF5q+b7416N4W8O?=
 =?us-ascii?Q?wbG252fTihlrABnwOec/vbR20Y6Qml77R3jI7rwvABgPJg5WvHV+7d1/LFiL?=
 =?us-ascii?Q?3pLYyV6NJzWmdh5Vuwk4s3SDa6BAI/kjSTP4ZDqlRatAKPtUPFMBOdOdgjew?=
 =?us-ascii?Q?lYUsmeTJrGNgGY8adl3O/urHAK6lwWiX7x2gVbGNYiUF2o95aGdiVuw3qa6d?=
 =?us-ascii?Q?1OVIwUPXn2Z6LNWrLdRSQQMrgMw1Ry8TM0+Vu9LfrOu9SSFUjje8rhXjdHI4?=
 =?us-ascii?Q?gcnOrtghOv1WQWjsiKHh4z9k3icgm/lvQAyIIneWxVNB69mjMzNnnrOCxZfQ?=
 =?us-ascii?Q?WEHz27PHh2KW/tPUGdpNA0vN8IVvftHhjU81LZzvw3QHMtaPqVENfsjUEgXx?=
 =?us-ascii?Q?PJl3hy7/4d8spezlfiSR449enfA3gF+tBW4Xgjb2W31ipHi2pzJiHtF7neln?=
 =?us-ascii?Q?E7/W2lBMXicj4AKFsT7aaKs1WOSAAy1lQeF2lMyGnDUUE6Vp68A5ZZxyQeHP?=
 =?us-ascii?Q?9Mw/EaXqKVkoY9LbG/3UDHsxhowmd7oo4scSdn6NlawY7iwF+GR9Ftl4QeZF?=
 =?us-ascii?Q?Yy6S5mjT0+cs+3Cg0AjimHJr6sE5RMMPYX3g7YBjrZYRv3OoFoX4r4biEwWh?=
 =?us-ascii?Q?S0PsBm1greMrWqWgc5PfxKB2XzI3xese+6Qu+uADcvzCWX7/sv1qEf3u2B9L?=
 =?us-ascii?Q?6cJLHNqw/K37pw83s3nrezpcIGFDcYikVqYjaXMmQzD6ExtdljxN91fAS8i4?=
 =?us-ascii?Q?0mVpU9jAv/kr7N7AQ1o/l3upfQNo4Qpwt97LdNhZmgrOyQyvzAiisEJWhUCx?=
 =?us-ascii?Q?ue6bvfnKFIMIUMHRpyKOcWs171ufENZFa4xR4ZOf+DW0/IyIo5mhZy8ZcxU7?=
 =?us-ascii?Q?2x3eC3YUMyVDv0G+yUwapadNSjpgtElsE2Y6YQNWhG/t4yZOd3jtxGVfD2sD?=
 =?us-ascii?Q?v6dqXZ4pPl2Uzp07T58cNK3c+/OWNcGEw/O5z7funSbIyUnkVo4NXRmzwet8?=
 =?us-ascii?Q?qZseQlNmJhsqYpg0Ip89OD7JK0T+7AtT/x8mUmalvnHexL1PFO17uQlU49Ds?=
 =?us-ascii?Q?Z8Nd3ehMoG15Jn/2yDaPa1qp7+qbLuN+gtXjCr6wiwcq7fvJL5QaShBg127B?=
 =?us-ascii?Q?I16rEtTKG2GXPtUKOxhXwbkgg/+iBe2P5sKTOvAF4asFHDg50b6A7BfGf2lB?=
 =?us-ascii?Q?vjRw6t+6eDm4jTnAKPaSbau3/YPzvyzkMHqEM9FUJGWGo3a2aXrJzxhTMC28?=
 =?us-ascii?Q?VYgQeAMIIz5tczUJdfmhoMQxv/8Y2ZgufgcNmhBwraVrYkMp/oVkHvx5pVsZ?=
 =?us-ascii?Q?9grUJS6ZqOO/v3O+X4Use2rO1z9u/dq7wJymybMPSwW9UxeDYL1bbqBxr0yT?=
 =?us-ascii?Q?SUIi42W2eITITANBDaE7l7n8deF4fX23UmXgRgUF/qIStDMcwpCuESv8scqP?=
 =?us-ascii?Q?iekKquXkh+rOGMNNSZxEPjJzP645ulnvywojfZkr4Eggnm5D5TXBJVSQ7m3H?=
 =?us-ascii?Q?G/k3ZLce37bSNesYfMIawg0TSU3nczfm0v7Zb1W9rFQsDZQoBzrLfOurwmeg?=
 =?us-ascii?Q?3kHsBSV63XVSDaSt/VQENu+R/eQF4n5V923D+tnW?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c624ec1a-4c91-4118-44e0-08dc22715ea0
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 15:29:09.5704
 (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: /c9A+rGN8ctk4MyS9J4Wk6AdxLKQvUzhH5ckPnAEdJSgmQGa99XhHHOceIoxvsm2icfabeqffH7/69n8gpBMzA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7657

On Wed, Jan 31, 2024 at 01:58:08PM +0800, Xu Yang wrote:
> i.MX95 has a DDR PMU which is almostly same as i.MX93, it now supports
> read beat and write beat filter capabilities. This will add support for
> i.MX95 and enhance the driver to support specific filter handling for it.
> 
> Usage:
> 
> For read beat:
> ~# perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_rd_beat_filt2,counter=3,axi_mask=ID_MASK,axi_id=ID/
> ~# perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_rd_beat_filt1,counter=4,axi_mask=ID_MASK,axi_id=ID/
> ~# perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_rd_beat_filt0,counter=5,axi_mask=ID_MASK,axi_id=ID/
> eg: For edma2: perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_rd_beat_filt0,counter=5,axi_mask=0x00f,axi_id=0x00c/
> 
> For write beat:
> ~# perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_wr_beat_filt,counter=2,axi_mask=ID_MASK,axi_id=ID/
> eg: For edma2: perf stat -a -I 1000 -e imx9_ddr0/eddrtq_pm_wr_beat_filt,counter=2,axi_mask=0x00f,axi_id=0x00c/
> 
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

Reviewed-by: Frank Li <Frank.Li@nxp.com>

> 
> ---
> Changes in v2:
>  - put soc spefific axi filter events to drvdata according
>    to franks suggestions.
>  - adjust pmcfg axi_id and axi_mask config
> Changes in v3:
>  - no changes
> Changes in v4:
>  - only contain imx95 parts
> ---
>  drivers/perf/fsl_imx9_ddr_perf.c | 86 +++++++++++++++++++++++++++++++-
>  1 file changed, 84 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/perf/fsl_imx9_ddr_perf.c b/drivers/perf/fsl_imx9_ddr_perf.c
> index b1a58e9e1617..85aaaef7212f 100644
> --- a/drivers/perf/fsl_imx9_ddr_perf.c
> +++ b/drivers/perf/fsl_imx9_ddr_perf.c
> @@ -17,9 +17,19 @@
>  #define MX93_PMCFG1_RD_BT_FILT_EN	BIT(29)
>  #define MX93_PMCFG1_ID_MASK		GENMASK(17, 0)
>  
> +#define MX95_PMCFG1_WR_BEAT_FILT_EN	BIT(31)
> +#define MX95_PMCFG1_RD_BEAT_FILT_EN	BIT(30)
> +
>  #define PMCFG2				0x04
>  #define MX93_PMCFG2_ID			GENMASK(17, 0)
>  
> +#define PMCFG3				0x08
> +#define PMCFG4				0x0C
> +#define PMCFG5				0x10
> +#define PMCFG6				0x14
> +#define MX95_PMCFG_ID_MASK		GENMASK(9, 0)
> +#define MX95_PMCFG_ID			GENMASK(25, 16)
> +
>  /* Global control register affects all counters and takes priority over local control registers */
>  #define PMGC0		0x40
>  /* Global control register bits */
> @@ -240,6 +250,18 @@ static struct attribute *imx93_ddr_perf_events_attrs[] = {
>  	NULL,
>  };
>  
> +static struct attribute *imx95_ddr_perf_events_attrs[] = {
> +	/* counter2 specific events */
> +	IMX9_DDR_PMU_EVENT_ATTR(eddrtq_pm_wr_beat_filt, 73),
> +	/* counter3 specific events */
> +	IMX9_DDR_PMU_EVENT_ATTR(eddrtq_pm_rd_beat_filt2, 73),
> +	/* counter4 specific events */
> +	IMX9_DDR_PMU_EVENT_ATTR(eddrtq_pm_rd_beat_filt1, 73),
> +	/* counter5 specific events */
> +	IMX9_DDR_PMU_EVENT_ATTR(eddrtq_pm_rd_beat_filt0, 73),
> +	NULL,
> +};
> +
>  PMU_FORMAT_ATTR(event, "config:0-7");
>  PMU_FORMAT_ATTR(counter, "config:8-15");
>  PMU_FORMAT_ATTR(axi_id, "config1:0-17");
> @@ -271,8 +293,14 @@ static const struct imx_ddr_devtype_data imx93_devtype_data = {
>  	.attrs = imx93_ddr_perf_events_attrs,
>  };
>  
> +static const struct imx_ddr_devtype_data imx95_devtype_data = {
> +	.identifier = "imx95",
> +	.attrs = imx95_ddr_perf_events_attrs,
> +};
> +
>  static const struct of_device_id imx_ddr_pmu_dt_ids[] = {
>  	{ .compatible = "fsl,imx93-ddr-pmu", .data = &imx93_devtype_data },
> +	{ .compatible = "fsl,imx95-ddr-pmu", .data = &imx95_devtype_data },
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, imx_ddr_pmu_dt_ids);
> @@ -410,6 +438,56 @@ static void imx93_ddr_perf_monitor_config(struct ddr_pmu *pmu, int cfg, int cfg1
>  	writel(pmcfg2, pmu->base + PMCFG2);
>  }
>  
> +static void imx95_ddr_perf_monitor_config(struct ddr_pmu *pmu, int cfg, int cfg1, int cfg2)
> +{
> +	u32 pmcfg1, pmcfg, offset = 0;
> +	int event, counter;
> +
> +	event = cfg & 0x000000FF;
> +	counter = (cfg & 0x0000FF00) >> 8;
> +
> +	pmcfg1 = readl_relaxed(pmu->base + PMCFG1);
> +
> +	if (counter == 2 && event == 73) {
> +		pmcfg1 |= MX95_PMCFG1_WR_BEAT_FILT_EN;
> +		offset = PMCFG3;
> +	} else if (counter == 2 && event != 73) {
> +		pmcfg1 &= ~MX95_PMCFG1_WR_BEAT_FILT_EN;
> +	}
> +
> +	if (counter == 3 && event == 73) {
> +		pmcfg1 |= MX95_PMCFG1_RD_BEAT_FILT_EN;
> +		offset = PMCFG4;
> +	} else if (counter == 3 && event != 73) {
> +		pmcfg1 &= ~MX95_PMCFG1_RD_BEAT_FILT_EN;
> +	}
> +
> +	if (counter == 4 && event == 73) {
> +		pmcfg1 |= MX95_PMCFG1_RD_BEAT_FILT_EN;
> +		offset = PMCFG5;
> +	} else if (counter == 4 && event != 73) {
> +		pmcfg1 &= ~MX95_PMCFG1_RD_BEAT_FILT_EN;
> +	}
> +
> +	if (counter == 5 && event == 73) {
> +		pmcfg1 |= MX95_PMCFG1_RD_BEAT_FILT_EN;
> +		offset = PMCFG6;
> +	} else if (counter == 5 && event != 73) {
> +		pmcfg1 &= ~MX95_PMCFG1_RD_BEAT_FILT_EN;
> +	}
> +
> +	writel(pmcfg1, pmu->base + PMCFG1);
> +
> +	if (offset) {
> +		pmcfg = readl_relaxed(pmu->base + offset);
> +		pmcfg &= ~(FIELD_PREP(MX95_PMCFG_ID_MASK, 0x3FF) |
> +			   FIELD_PREP(MX95_PMCFG_ID, 0x3FF));
> +		pmcfg |= (FIELD_PREP(MX95_PMCFG_ID_MASK, cfg2) |
> +			  FIELD_PREP(MX95_PMCFG_ID, cfg1));
> +		writel(pmcfg, pmu->base + offset);
> +	}
> +}
> +
>  static void ddr_perf_event_update(struct perf_event *event)
>  {
>  	struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
> @@ -490,8 +568,12 @@ static int ddr_perf_event_add(struct perf_event *event, int flags)
>  	hwc->idx = counter;
>  	hwc->state |= PERF_HES_STOPPED;
>  
> -	/* read trans, write trans, read beat */
> -	imx93_ddr_perf_monitor_config(pmu, cfg, cfg1, cfg2);
> +	if (is_imx93(pmu))
> +		/* read trans, write trans, read beat */
> +		imx93_ddr_perf_monitor_config(pmu, cfg, cfg1, cfg2);
> +	else
> +		/* write beat, read beat2, read beat1, read beat */
> +		imx95_ddr_perf_monitor_config(pmu, cfg, cfg1, cfg2);
>  
>  	if (flags & PERF_EF_START)
>  		ddr_perf_event_start(event, flags);
> -- 
> 2.34.1
>