Received-SPF: pass (google.com: domain of linux-kernel+bounces-31397-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Frank Li <Frank.Li@nxp.com>
To: manivannan.sadhasivam@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,
	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,
	lpieralisi@kernel.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v9 02/16] PCI: imx6: Simplify phy handling by using IMX6_PCIE_FLAG_HAS_PHYDRV
Date: Fri, 19 Jan 2024 12:11:08 -0500
Message-Id: <20240119171122.3057511-3-Frank.Li@nxp.com>
In-Reply-To: <20240119171122.3057511-1-Frank.Li@nxp.com>
References: <20240119171122.3057511-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?kMKmIYZXpnauVVooWlZYWh3l5bkikUawcckoE0mgADfkK6VDanYK5w/i1Wuw?=
 =?us-ascii?Q?muDbNYiUOITbZAR65COKYOJL+wDrmvlRyo0+rBlqCsaffA6D7O131gAcPbUQ?=
 =?us-ascii?Q?sV/Ore1UmJfMYfIWU2gDvRY3JzBCCD2JWLRJS1kdkxXoxoREAVKoB+izU1U+?=
 =?us-ascii?Q?n3o47LsmrjpNV9jktLdetLKSwyzMzwESjjO9ArrB9AKi5IovdJ8FJKbSY4fS?=
 =?us-ascii?Q?dVDCx8BjssfgBOl1y+reu/8dzEtRsQbXo5fRX5F1wOZrVii2phwZaTz0Qetb?=
 =?us-ascii?Q?GGQs1BjgbDOgvCDZSTcolhuBiLtI7NP8c9jNbN1DelMoo+tT7P4S5mkjpsjA?=
 =?us-ascii?Q?IZjlgCFUmpQP7+6a6NhD67PFParA7P3Pz6c0ER6pe+fbOGpANQvvD/4Uzslu?=
 =?us-ascii?Q?EhP2u4JAkDXsrmzEHOWcqaSV3Bdkh9vsq3l+b0G7S+JwLlPhBJ+JkBd0I9XP?=
 =?us-ascii?Q?24SapUWkEfQVqT+bfeURfBWKdyTFsUhzul7NdwDF3LGvipYwWQUJandqqoMJ?=
 =?us-ascii?Q?uPE4NEJW7OMaT8wkXn6Zx6h/F8Iu803VDaKXo2Kzyk0xXku7JOZGAFYum6OB?=
 =?us-ascii?Q?wegwKwsAuGU27d9UFfDW0mqXdFAbMdjTyyG9hUOCWd2Jbos5nLZH0ubzSrRS?=
 =?us-ascii?Q?7A2t61+kGPLYA5ZBDO2O7lo8aI2UPIRcUGRAnsv9yNzpYQ3j5oUXI+Cd6Fi3?=
 =?us-ascii?Q?zU7fbg6IjF83qg9YLEG4YzANgGSA3yeilL/eax2+DEQtMFNHagQc9BRmkD+I?=
 =?us-ascii?Q?PsRp/VCbUk6+zkgQhKitbKzZFmebQs6EJCYhN34o+duKAhTT0jN3rrE5Ffeg?=
 =?us-ascii?Q?jKb/uMobm41ESDwYr3gVYk7uDBQOy7RLxwl3vvEi8jV16CCEAdoPKVPC416D?=
 =?us-ascii?Q?dJWoBstL8KlSiGaLnpwGm+dV3mDEwwj1BfFB/O8Mjt2A9/dw3unObEdXOdBx?=
 =?us-ascii?Q?d7Vb+ncjptbJAcTIGgzQmIY0+xW7JiKHdLis8nDoU7dMSNF8qNZ81z8FXhKA?=
 =?us-ascii?Q?HmtojSK0t+mxqldgYqElqKlmfeHAiNLSGCAkO2/n4ODAoZ4IvpsHC2M24Zfh?=
 =?us-ascii?Q?d7BY+r6zZ9a4NhJwD/SLDmPyUrm3kbvkEee33UVrbTXT2QJnv8Lb2tEKkaxv?=
 =?us-ascii?Q?0rsuUfy3YnUTk77xQXf7eKVKEA+c2giT/cQ6GYd6CT6rqrW35VybbCLO6bzv?=
 =?us-ascii?Q?mkvPK+PQ32C0XTDmOOn2XjSUKp84OggqWAKk4hhjkacBBSXpn66QPQnSXIMU?=
 =?us-ascii?Q?MuPyGz73UAc8GWJg4Zw76alDWl9HUEg3VC2IKDJ3HuD3mhyWMGqJArnsobiV?=
 =?us-ascii?Q?1ICrc+7S/NXQcnv9b9oKsoNYNY05fKC/uAi14TpuLPN2r3wcNpNMhG1BMpVB?=
 =?us-ascii?Q?ovRjOdg175e8pjfALW5e8rbQLqwQ5wHvnH8kIPG0gkFFdjC/wK0yp2jBStSD?=
 =?us-ascii?Q?ql1chrnkRhgu4wP1MlVCH8SIARlg48dzMvEMHAgzhjWI1R3v3queGPfCIZ/k?=
 =?us-ascii?Q?m5JtZ4sJNLr+ZTio37XmzjKS1ZGJBnuIRM1fHBqf9qw5+0BLwn2u5QHiTxub?=
 =?us-ascii?Q?vWOGsMGG+M/GaFcdeeA=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 20663744-fcbd-4ffe-059a-08dc1911bc1a
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 17:11:54.2131
 (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: P0RQtp2+AUuPUUQNyNlncGAFHNOz7Yr1tUNZTe674/Rta/dKS6B5EYoQGgFRvazpg/YxzzH/HyiFs0UdHnsMvA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9688

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 0997dd7d901a4..a33ec006660c8 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 IMX7D:
 		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
@@ -1306,11 +1316,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;
@@ -1454,14 +1459,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),
@@ -1475,6 +1483,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,
@@ -1482,6 +1491,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