Received-SPF: pass (google.com: domain of linux-kernel+bounces-73327-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,
	cassel@kernel.org,
	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 v11 02/14] PCI: imx6: Simplify phy handling by using IMX6_PCIE_FLAG_HAS_PHYDRV
Date: Tue, 20 Feb 2024 11:19:12 -0500
Message-Id: <20240220161924.3871774-3-Frank.Li@nxp.com>
In-Reply-To: <20240220161924.3871774-1-Frank.Li@nxp.com>
References: <20240220161924.3871774-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?fAc4jgRit4jFx7mbnG/Qix+z9kwRBm1Va7iVr9SjcwFs9NsXpwtTt8TEF0KB?=
 =?us-ascii?Q?D9puLlJC1mXRQmax/fJhczf4fZwPVWytRFOcUcekGXIIBdQJdvSS7SeUXKJ6?=
 =?us-ascii?Q?D8xZ00iM09l6k0H4GGJAq5ph/rjcj6be90Nv80UaY3Jc/xuSvLHonBdAyfqq?=
 =?us-ascii?Q?IUW5sIympkn0KMj8BCsAqNQc+1EjkvdI/SINEPZoxwil2kNrzVnCdaobfu6s?=
 =?us-ascii?Q?g+XVg+WNK+xNzgnjNe10UE0e0wrOhJ/0u2vdpmwXBA1gbIgszalaPbDTlLoS?=
 =?us-ascii?Q?iahuhKFFN1BPm6S/2x0yxRQHU43ken647sHGmyECQ1GDtCi6yK3Myqt0MW3t?=
 =?us-ascii?Q?H0CyRB/A6flVIwlfyC5gAnI9Xq03axX08molyrPga1KvbFjYeokSyjPWFfGL?=
 =?us-ascii?Q?o2kIYB3dWQGyf11aV6w6wybxhmYBgOlSFe8KstC6gTFYL0zF66Ysye5wbH6U?=
 =?us-ascii?Q?wZBoUMyGjBvNazlyg12wUQOW0Ey15/h15C5WYWa6rZKWIiq0Kp9bUWuGadp/?=
 =?us-ascii?Q?GdyU9E0kEd1s1N3tW8vHMkT/v9ED9RF/3c4Qu+Jp0QCzSumylSOxofS/P20O?=
 =?us-ascii?Q?QDr6mCImIPdeNFPRaIUn2cPp8VGpHNTU+hrwaYvch9ESeeD43c8tn6cJwQh3?=
 =?us-ascii?Q?1R+RKhu+HtsfIk/UJ3hon8Qzm4P3oDrN1TxP50AeXFpMS7DHu/2JoUOx70BM?=
 =?us-ascii?Q?uTz15XrjSBOVsTgBN1hJ2E+1LsQGnyipRffC/IbA69MEaUNy1Bl3kBXFIsRb?=
 =?us-ascii?Q?7Kdqjt7EEytNhaHegD9gYY0UAxe7g5mfgNxVd/O9Qbssafh/ep2MJBlpo2Qp?=
 =?us-ascii?Q?qni7RJ7dmIAXEV70N2pAYRJ8ENYHtjONBj6QPOUjj9ZWyRw6AuPOP9THrjLU?=
 =?us-ascii?Q?iBH9aOpFkUfMJlv1md44mmbUB26IlsOB1j3pzRmQtYFNYXjzm67YLFT32+9L?=
 =?us-ascii?Q?XQ0yR7iPm/igtkAPlXGx14Eu4+6yThU9bPhSCq2sG3hoc0DmizVEXdFPeDX8?=
 =?us-ascii?Q?heOxXXQ3yxE/Zq4LvvIhv/377z54esAy/DC3dDTUMSNzzBoC0hsWvNk9FBqJ?=
 =?us-ascii?Q?Z7IGPAxFIpjP+OSb9tRdVh2En8zGnvfg/kucaGkcJTYWvwfc8TY6VfV01yOi?=
 =?us-ascii?Q?61272VK7gzqDIUNl86U5XqZqAWE7uYyQAH1SYxoHpgpRoZLUO+votmFWeLbk?=
 =?us-ascii?Q?nMmchWGx7OdhAst+0T8VSwyn0rWh7s+m28Tp58HsFjGaHRzENYl8GIz0kO5U?=
 =?us-ascii?Q?L3xFz7bN2+HSC0qDTLoKRsJ7etkWCu2ka2Z1pfTn/QmQvLTWtIOzkXUIMNvP?=
 =?us-ascii?Q?w54lM34mYWZIJYR8fGetY0BbqIfNKi72t00pegg+ApliEiIZgu9yU3BpUZGE?=
 =?us-ascii?Q?V/KhmQ2f6ulimHTeFry1DZZJFXF4rIDWZ+J3aIwJFwqm/WX2ebmBYVJY8RSv?=
 =?us-ascii?Q?jyS5NuaP1y7L6iJMbykRXYdCWU8rZk86az2B+Uj6sNn7ccn1WU28XfPoIIwh?=
 =?us-ascii?Q?vXJVSvUePDx5Ms0v8VcDNHlXZwWGAHBbewEmtNnCOeuApjDOvrTnqMNroeWx?=
 =?us-ascii?Q?E5Mmi0sh/G8BivHwSqmoe1vawlK5iUSnK0AB0px6?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a428284f-994f-403e-7f1a-08dc322fc5c6
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 16:19:54.4103
 (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: GcdpCD8yPGMJYjRkD14IPaBRds+x7UV53PmkgOeQ307sCQVqSrCL2Ygs2emvjxBJBGUnzP7ca5ywxACCu2qduQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8682

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 93c304899bd6c..12a2bc76f0b39 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
 
@@ -1278,6 +1281,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:
@@ -1309,11 +1319,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;
@@ -1457,14 +1462,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),
@@ -1478,6 +1486,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,
@@ -1485,6 +1494,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