Received-SPF: pass (google.com: domain of linux-kernel+bounces-53114-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@nxp.com>
To: lpieralisi@kernel.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,
	krzysztof.kozlowski@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,
	manivannan.sadhasivam@linaro.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v10 02/14] PCI: imx6: Simplify phy handling by using IMX6_PCIE_FLAG_HAS_PHYDRV
Date: Mon,  5 Feb 2024 12:33:23 -0500
Message-Id: <20240205173335.1120469-3-Frank.Li@nxp.com>
In-Reply-To: <20240205173335.1120469-1-Frank.Li@nxp.com>
References: <20240205173335.1120469-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?dtYLTzzABipgRgH+0SBW0SYy75oF6uyD/Ld4n9P8wQi2XWBvvdkq/64STsX7?=
 =?us-ascii?Q?DRiBsR0M2G6hIj/ZLgKqAofFUWj+ATLAfJspcU9Dkr8R9U91DB/rsh2prUdx?=
 =?us-ascii?Q?95ivHbFKN2O/hSlqsGiITd+1ruSfSnnaRPEi9wzdTuU2DEL7LDattQM/XXOu?=
 =?us-ascii?Q?ERLKxzlVz1gxYK6Y4yHZoQd5LUCH3dI05zb2Wy97V4g7moQ0E7shI72dYrGe?=
 =?us-ascii?Q?8mRbeceky5EfW9jWIE0rCep4vsBvMJlUFYljgXg87S61L9jk6QHCKeQNT6gQ?=
 =?us-ascii?Q?d/+MPhapECxfM5ZuBh24D1XZXQ8E0dDU8uKYgpMYUzkHRnTpCpfEI9J25/N2?=
 =?us-ascii?Q?mRRA/RNXjXsPxfrqLWIgx5YGFKRhZfNpkrxyyFmOrwZwRv1sIFliyUo1QTfj?=
 =?us-ascii?Q?4if3QhIGlQ6cD1HF4XlakA7Yum2Lpnhl0Aev4QRIN97O4kvc964tNkly+CZE?=
 =?us-ascii?Q?vZ6SV91QRWn9FMfLOtz9AtcjS6zk4nyXqBp5NQywjJr9jyIVrZSfUTB8P/AU?=
 =?us-ascii?Q?/OgwgXAV9n5hE7l0d4eUNgVwf1pAzouvcPM8FoJ8kRXsx2Ei/iu5XemtA1E3?=
 =?us-ascii?Q?FqKYh/QCxEFhVxzyYllBkTibCOGrwxRLGdWWMyau8gwwX+iy8T3toPXdRM/X?=
 =?us-ascii?Q?2eRijtAFQtnsfV4fc4qk+ljp8ycROWhSJqZxGBQNwGsQ/d7M5EuCtC7NBjwk?=
 =?us-ascii?Q?zSYun/0Qg6CBq5vX8Dbr2n7avPMHVDVnoa6eo7w97fNQg1HbUf/M7umu7iB8?=
 =?us-ascii?Q?dPj2oVwxSQGvCjUSf5uPyWJFnhKn1zZAO4YNhTHYYpHq1taR6JQIlbfT5/Ss?=
 =?us-ascii?Q?eglTMpdE2OZRkYnA97KsK2sLEBM0twxdYXl9nhNO7mX+sBO+cTpd5biSsj6G?=
 =?us-ascii?Q?lkxLpoySCx+BrqmuJZDFpnTasnQJVzjXCuXR4RGRV2H9yPq+mJNK2pz1O5q2?=
 =?us-ascii?Q?2CDLKwqT+MMhspGJx9UmWVDDc/yTCNOZPaAABRJgWlgXGHZ7TnZAjabVNzrk?=
 =?us-ascii?Q?r4xBb3e+7kHFKG3zJ9BayQVvEO3de1QFWPtiDd3N8tGX9Cnep5SN+yS4f8bU?=
 =?us-ascii?Q?UGYiZKezDLtBfNr+A5AorUyrcVrSYVbfbNgrhuLIuso1K4XI3u5ExHP3uAGj?=
 =?us-ascii?Q?KfEx+0Ekx0HntIYSKvcl4OlzH2LlkChIbfDwZCN6lUndy/onK0SksZ2EG1YG?=
 =?us-ascii?Q?Lq/uViGCZmc3eNLIxxb47GFTqVF04W8eN+pmrI2PC5p4HiUkKMnN1G1OmlPT?=
 =?us-ascii?Q?VLSdQDX0FUVkdpEl9Ak8a3t/ap5uoNa/OGTngQ2JQlIDtOORqpk6kSiTU9fh?=
 =?us-ascii?Q?vjyu//Vy6SddBCfuvjO4UA47Us4diELnqEWydmR1cDSIGb+PLGM5w6PXExFT?=
 =?us-ascii?Q?aw7Gk2bcSZWYyU6iW3wHHelBFps5s+jTdIj4YJUn5iWKx78jPXHuR5ojy7G8?=
 =?us-ascii?Q?AqUiZ1iss1LhOQp1oJmKryH8Shy29sdxooTbPgPwrRoT4GISdHwEEb36Nk1P?=
 =?us-ascii?Q?m15d5nVgMVEmIUvNqolVV4IMlsGuCQUWrZRVP79FBXlUA5vOl5FxQNdCSyao?=
 =?us-ascii?Q?I4Z/fVkIGB3f3hV0EgN3H7a/LBvuPc/m1o4Qx3o+?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c260421b-44df-49d0-d697-08dc2670a648
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 17:34:04.9458
 (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: wyOsE/c34/mfb0LT58HqPDLRecYIaip9xvGiiJnrMO6hQubwYxB4CQCW+bRfi1Riw4l7terqRC/c8gT//LttNg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7733

Since some i.MX platforms make use of the separate PHY driver, use
IMX6_PCIE_FLAG_HAS_PHYDRV flag to identify them and get the reference to
PHY from DT. This simplifies the code.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v8 to v9:
    - change commit message according Manivannan's suggestion
    - Add Manivannan's review tag
    Change from v7 to v8:
    - renmae IMX6_PCIE_FLAG_HAS_PHY to IMX6_PCIE_FLAG_HAS_PHYDRV
    Change from v6 to v7:
    - none
    Change from v4 to v5:
    - none, Keep IMX6_PCIE_FLAG_HAS_PHY to indicate dts mismatch when platform
    require phy suppport.
    
    Change from v1 to v3:
    - none

 drivers/pci/controller/dwc/pci-imx6.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 82854e94c5621..59f117f855c26 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -60,6 +60,9 @@ enum imx6_pcie_variants {
 #define IMX6_PCIE_FLAG_IMX6_PHY			BIT(0)
 #define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE	BIT(1)
 #define IMX6_PCIE_FLAG_SUPPORTS_SUSPEND		BIT(2)
+#define IMX6_PCIE_FLAG_HAS_PHYDRV			BIT(3)
+
+#define imx6_check_flag(pci, val)     (pci->drvdata->flags & val)
 
 #define IMX6_PCIE_MAX_CLKS       6
 
@@ -1277,6 +1280,13 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_PHYDRV)) {
+		imx6_pcie->phy = devm_phy_get(dev, "pcie-phy");
+		if (IS_ERR(imx6_pcie->phy))
+			return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy),
+					     "failed to get pcie phy\n");
+	}
+
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX8MQ:
 	case IMX8MQ_EP:
@@ -1308,11 +1318,6 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 			return dev_err_probe(dev, PTR_ERR(imx6_pcie->apps_reset),
 					     "failed to get pcie apps reset control\n");
 
-		imx6_pcie->phy = devm_phy_get(dev, "pcie-phy");
-		if (IS_ERR(imx6_pcie->phy))
-			return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy),
-					     "failed to get pcie phy\n");
-
 		break;
 	default:
 		break;
@@ -1456,14 +1461,17 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MM] = {
 		.variant = IMX8MM,
-		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
+		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
+			 IMX6_PCIE_FLAG_HAS_PHYDRV |
+			 IMX6_PCIE_FLAG_HAS_APP_RESET,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = imx8mm_clks,
 		.clks_cnt = ARRAY_SIZE(imx8mm_clks),
 	},
 	[IMX8MP] = {
 		.variant = IMX8MP,
-		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
+		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
+			 IMX6_PCIE_FLAG_HAS_PHYDRV,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = imx8mm_clks,
 		.clks_cnt = ARRAY_SIZE(imx8mm_clks),
@@ -1477,6 +1485,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MM_EP] = {
 		.variant = IMX8MM_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHYDRV,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = imx8mm_clks,
@@ -1484,6 +1493,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MP_EP] = {
 		.variant = IMX8MP_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHYDRV,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = imx8mm_clks,
-- 
2.34.1