Received-SPF: pass (google.com: domain of linux-kernel+bounces-12210-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Frank Li <Frank.Li@nxp.com>
To: krzysztof.kozlowski@linaro.org
Cc: Frank.Li@nxp.com,
	bhelgaas@google.com,
	conor+dt@kernel.org,
	devicetree@vger.kernel.org,
	festevam@gmail.com,
	helgaas@kernel.org,
	hongxing.zhu@nxp.com,
	imx@lists.linux.dev,
	kernel@pengutronix.de,
	krzysztof.kozlowski+dt@linaro.org,
	kw@linux.com,
	l.stach@pengutronix.de,
	linux-arm-kernel@lists.infradead.org,
	linux-imx@nxp.com,
	linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org,
	lpieralisi@kernel.org,
	manivannan.sadhasivam@linaro.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v7 14/16] PCI: imx6: Add epc_features in imx6_pcie_drvdata
Date: Wed, 27 Dec 2023 13:27:25 -0500
Message-Id: <20231227182727.1747435-15-Frank.Li@nxp.com>
In-Reply-To: <20231227182727.1747435-1-Frank.Li@nxp.com>
References: <20231227182727.1747435-1-Frank.Li@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?NvyqK8ISlswTG03y4kdQCBDYCEYB8NMm3J2Mtmw6lIdVL+MJhDEyxQ1c7sLa?=
 =?us-ascii?Q?W3BCU1itnIj4F+022DBorYsqmsQE0lnLYJRaGLePUgiomiq9FOgfku3YIlNs?=
 =?us-ascii?Q?gTS68l0jsbv444Z5p10lWlat4ZvEyIB5lOTXdeCcG50Q+viwVM8XucZVWxj9?=
 =?us-ascii?Q?yRdwcBJI3YfFWgklyBcNhLbdgNOQ9DPD3JtWcn/GUoQBfJIzdtF4v1GAIiUz?=
 =?us-ascii?Q?mS9q5l3IP7SHbc0psUZDD1Hbk0m9iBU2NbiajN0EFAHtM0pScCUtlMTTG2fF?=
 =?us-ascii?Q?YOWgjO7Pk+yOkFR9YnEI8fQBvW5rzkW6+xddyHZ0/KXRvpVLSl6wBEPEnITM?=
 =?us-ascii?Q?xGDVxxIZp8oKCqYz+rCaB5CFEs/h2OjnshI0O6i47scSL9TuFuXD01qjdmQA?=
 =?us-ascii?Q?a1E7ujQsJMHTNR5PC5jLODjxZm+/b95ynu0fsmGFBzovbm7W1PG85OdvbEos?=
 =?us-ascii?Q?ZjX8mTv/TZjfaZeS6rIlgOdcctzk1UU2TwUWM18dWx5NfDBnMq7aAc5h2Lfg?=
 =?us-ascii?Q?kSupFckG5FVIlO2VHCx7OshnsGXvXd5am+rbzUUTRF0GeNcekqrQbIz2Lit2?=
 =?us-ascii?Q?t6rFNmkvpw6V3q3e2Z3NR/DKFeLaWZXWN76scQWwYjwyHNb+qYx7qllxP5EI?=
 =?us-ascii?Q?6ARaQA1Pe2aYYeEwYkhnjuo7qFzxtqUtdacla05JYsPDmWcuw6W32wr1O/cb?=
 =?us-ascii?Q?vH2jNodluZTbcd3h/6N79iTDf6ET9soMbyVfcyJmA32sQz+RJcYYzIMYKQGN?=
 =?us-ascii?Q?BMB+m/9Xqbj1/nlCqIvNzlRcaaCXbB8tqsnbrZDoMt33NMIIgKW5HHXG2PyC?=
 =?us-ascii?Q?teI9AAvci/9lQKJNbN7Lkk6bYRtxTAZL/XlxuQ+ogGhgJMORIzks+oqGg/6q?=
 =?us-ascii?Q?b7ajiXj4HQfe0qLNhHV7v2WirQI9wGThLBIIM2+w1yS94+py9NqVES348soS?=
 =?us-ascii?Q?1Qhm8gEqyZ6FUc+D6TYkTTCIzJXANJJzjHROhvreFN+0Tc1a8xmwaOMbt9ec?=
 =?us-ascii?Q?ncYknwR7i3l2gPtLiErWDrT0ofs1V86fKeh9/kMuxv1cLmanfEunCxusM/vt?=
 =?us-ascii?Q?xl93XLsrf9zn+cfJ8IinMEssK7gWr7xeoVSm4wJkBRx+LTpklKc1z0qsDydJ?=
 =?us-ascii?Q?DLjO4bHRagJr6Ig8BhiZDkj+ZX3aFygR842ug6x1sS4NaefEExqqy7ZAboZ6?=
 =?us-ascii?Q?hAmTWVyI3JY4rr9M/2qe4RSZHlq13lBnCJvS7Dp4p8kIQbJ2CzpI0p4rnqa6?=
 =?us-ascii?Q?GWjhIqFHREiuO4JqgDoNVUC8D5POY2mO0+/TFYhsPyK43gOLIscH4F+BiBB3?=
 =?us-ascii?Q?bj04eMWCFtZxLxfPgZKK81XX6yBBS9tdTXnlGkImx2orrLEo4/bp+PVMMcOX?=
 =?us-ascii?Q?lEa+NEec3OSbMXdysCLi8XHJRrZKs5m4HdRYlO8qjjYf1ZyQam/x4bIOanEl?=
 =?us-ascii?Q?hcvZP3luId0FBQl1moMa8gEAqXvwv0jjKGB376VtJPitzsRDITVA0GLWEbyO?=
 =?us-ascii?Q?WzRLyImksY9t8PSXoJ5P/6kEh+y/kPSUQN8bnQEHX+ioFAHO+D+ls+/63FYu?=
 =?us-ascii?Q?bqlgXILWXpXfvKn5QG0=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f07a7711-c5bf-454b-4841-08dc0709b3fe
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2023 18:29:03.7128
 (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: rzs3oUCiUEAYmIUi5by6VpwMUmSK8zHXPN1FSf3K9/Y9iIJ5DHUb4TccBhWoYzfY+Npdi7FRykQdiZf3UAf3Kg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8271

The i.MX EP exhibits variations in epc_features among different EP
configurations. This introduces the addition of epc_features in
imx6_pcie_drvdata to accommodate these differences. It's important to note
that there are no functional changes in this commit; instead, it lays the
groundwork for supporting i.MX95 EP functions.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v5 to v6
    - add missed maxitems.
    - add comments about reuse linux,pci-domain as controller id.
    linux,pci-domain have not defined at PCI endpoint side.
    
    Change from v1 to v3
    - new patch at v3

 drivers/pci/controller/dwc/pci-imx6.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 4b2b9aafad1b4..6a58fd63a9dd2 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -104,6 +104,7 @@ struct imx6_pcie_drvdata {
 	const u32 ltssm_mask;
 	const u32 mode_off[IMX6_PCIE_MAX_INSTANCES];
 	const u32 mode_mask[IMX6_PCIE_MAX_INSTANCES];
+	const struct pci_epc_features *epc_features;
 	int (*init_phy)(struct imx6_pcie *pcie);
 };
 
@@ -1065,7 +1066,10 @@ static const struct pci_epc_features imx8m_pcie_epc_features = {
 static const struct pci_epc_features*
 imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)
 {
-	return &imx8m_pcie_epc_features;
+	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+	struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
+
+	return imx6_pcie->drvdata->epc_features;
 }
 
 static const struct dw_pcie_ep_ops pcie_ep_ops = {
@@ -1530,6 +1534,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 		.mode_off[1] = IOMUXC_GPR12,
 		.mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
+		.epc_features = &imx8m_pcie_epc_features,
 		.init_phy = imx8mq_pcie_init_phy,
 	},
 	[IMX8MM_EP] = {
@@ -1540,6 +1545,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
 		.mode_off[0] = IOMUXC_GPR12,
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+		.epc_features = &imx8m_pcie_epc_features,
 	},
 	[IMX8MP_EP] = {
 		.variant = IMX8MP_EP,
@@ -1549,6 +1555,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
 		.mode_off[0] = IOMUXC_GPR12,
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+		.epc_features = &imx8m_pcie_epc_features,
 	},
 };
 
-- 
2.34.1