Received-SPF: pass (google.com: domain of linux-kernel+bounces-2472-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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 v4 13/15] PCI: imx6: Add epc_features in imx6_pcie_drvdata
Date: Sun, 17 Dec 2023 00:12:08 -0500
Message-Id: <20231217051210.754832-14-Frank.Li@nxp.com>
In-Reply-To: <20231217051210.754832-1-Frank.Li@nxp.com>
References: <20231217051210.754832-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?Gue2lDNCKXWiUkuBp2VhsXyqs/jmijfFrG8FhX3lD5irm+y4jTwfyT1rUmy2?=
 =?us-ascii?Q?vH/uEuxjkB8PNn/gre+n9yr4Q//7e+cRJ2R943VRqD7CQEfmT23e60ylP8oS?=
 =?us-ascii?Q?leqTn/UiwBdYfNBfGRX6Kyj7+UskFluVLVKeyXoECsuNUI3bcTEs1yAcZl1k?=
 =?us-ascii?Q?pH2+f/pCvrtdzMBs6X+5NaI1jaSmolJwaOMFe0qUVfp4++PYqM07ugKJfyNk?=
 =?us-ascii?Q?fZMa8d/h668qmSck3taBOXDkIqsw92y8m4MIeriQG21uMwkBFk3f8ZUU68Ub?=
 =?us-ascii?Q?O+7No0h9xeTGG/82iFRaWEgC1O0rioqVLiRGm/kUi/m12Nwv5inFSI+DH8Bk?=
 =?us-ascii?Q?7rXR82irP2ymzy34hJKf+RzA0arXp2/ZeurJ8wyxJJjrpR+fMIacAA3qnJpi?=
 =?us-ascii?Q?C1kUfEIsLo/V5Yh/WKjrbo3K8a2C7m8AHM0B6IW7wG833cVf1kgBMs2f+SCH?=
 =?us-ascii?Q?fstGo0d/aNIDz2I/T4QTuCSLf6tJ3QYkYj/qEzBxxIAI9VBHolc1gEAnIncX?=
 =?us-ascii?Q?Tdp+9LlyH3eT6b+CBUv2Cs0fV8foYitiCfCNfm5DK1RJSoYot4W8oQlwOEvN?=
 =?us-ascii?Q?bfab+yAXcqFC+IlqLCPNEOQvDPa1E83esHnhi6SswLFe3JxUGOxzNKA4PnWz?=
 =?us-ascii?Q?MUBpiS4flw2uSXQII8Y6lP9BDWj6Bf5iI+ZSXf5OzrwWvpZDLlJ5Ik/DkJEw?=
 =?us-ascii?Q?jxSZa3iARB6qHbGlA8hn2Lyol4KToso/OcHHqlgwhXuEphjF0D1L/hDxTNfR?=
 =?us-ascii?Q?lH7fwyEyZwKzKHddJvnUsPtOzRlYLNHo0u1Rmzvqcz80y0koIx9KqEVvtQD1?=
 =?us-ascii?Q?AbjyNVMZkADA08vzw3fIu8+AIbcFSVg8LX5pTMYanK/ECSvT1c9wfLVEPkV1?=
 =?us-ascii?Q?8ftLaLJ3YubGDwFx1TwtmEDkR9gonKrSZxBjL8dRn/kG6yokm1nCPoll4JK5?=
 =?us-ascii?Q?McuijSDRM/yL0g1rOcKp2flI7dWBAt0ckW98xAf45xyQC0nVB+ONPGoEPKxf?=
 =?us-ascii?Q?NzDSyMeE4CXjNsqyu+L1gnL4TGhFsf0ZwZQJno4fw3/rWe4yvlcM/Fst/uBp?=
 =?us-ascii?Q?tALyEvIK6YaAVeNWiKfoNaVcaOtCsF/Jig+V4Tzm7FUu5FjiBtZGas/61zuR?=
 =?us-ascii?Q?ENp46nZKTw6F8QBWscnNqta4z7LR0O89U2bbjqKJ3+dfENPvELIvD3KSldOE?=
 =?us-ascii?Q?A8hYeYMJV404883SY91JtIuc5Fo+iRO8ugrQzruBM7nAsIYtSRf/YXPpxntx?=
 =?us-ascii?Q?QvnUnAMuaJlwRow7yDb/9zsiIfVQBYfcbgJ+eyirYX618s3jbTCNEeetSbJy?=
 =?us-ascii?Q?FUMWVOtdyXvTiHSppySLEu9p4rmG9wVgG/xW7lFZpkipPNFgGwUXoiglSlUy?=
 =?us-ascii?Q?5eQoZoeR9n+6GS72+Z6wZA16x0R6xqYHQCJALX7QOnVnFsNvl5SpiNM/bt+3?=
 =?us-ascii?Q?+dnZwAmmI9f0p2maluzimAbLD+fmGu9AMH9Kma3XMj/UAkVa5oTieqAGlfVF?=
 =?us-ascii?Q?3vqAVLYcBinNR1IkJbH9epiV9LaF0cEmeaUbo+7+/qC1vdlo+lTrvQylbIEa?=
 =?us-ascii?Q?aNxXkJl4KfdbkY3MJss=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ccbbbbdb-b094-4bc0-6409-08dbfebeef2b
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2023 05:13:41.4508
 (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: OWUGO1xfTXJxji05gIvgf3bqmltgf83j3qV7d9XcRJwxbfg78LPg9bpQfmtL6SR7qwAxkNDczVMiOFOHpB4pkQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8174

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 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 54b90f8576915..8f7b1533e2869 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 = {IMX6_CLKS_COMMON, "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 = {IMX6_CLKS_COMMON, "pcie_aux"},
 		.mode_off[0] = IOMUXC_GPR12,
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+		.epc_features = &imx8m_pcie_epc_features,
 	},
 };
 
-- 
2.34.1