Received-SPF: pass (google.com: domain of linux-kernel+bounces-12198-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: 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 02/16] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY
Date: Wed, 27 Dec 2023 13:27:13 -0500
Message-Id: <20231227182727.1747435-3-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?BtAvRiQxKoFsrNlmQVrWDWVlNRAghzmNOKZGha45FySnZUFBQuv0Nd6tElAU?=
 =?us-ascii?Q?2xGaNdQicM015Y4vEmkWCeq/YjWG3DU/1MDi/4gHBiy7R9TA3yjJ2qyPPDr+?=
 =?us-ascii?Q?AtHURqgh5M4JWaEF5/rZ9sLddhAGLQWxbBPzE4vlNbdn6Vk9uJ2YeHyPzBI9?=
 =?us-ascii?Q?wTB4uDvHLYkLPpPVHPnLCnLLgL8NVfa1SxS1tsVuDUnUm8AloPY5hyfikMea?=
 =?us-ascii?Q?RLkAGH4zDh2o1QIX+Yp3iU3A/f3mXZQOZcAbseO61bGE02OBuACKNQrfzjhs?=
 =?us-ascii?Q?q5AC7umR6pNPLuAbNXcr4kYITHIz9WKLkfW7nRJB7N/nSPkJffYftnpS5Sz9?=
 =?us-ascii?Q?86PpkLkrzfVopUukRWdhIzJWsE/MzZL7+lyAOIWL4wwGIalreOhK7LYCsy/Q?=
 =?us-ascii?Q?6bcbEMFssCjCZjFondSJeA888pYG+PFXdqP47qbBFtNLUFpyzb2l+3d/87EG?=
 =?us-ascii?Q?PTCh8FRdJOhsDwlnLS7jlTIThb94Ev4rn+ha+jrGJfW342T0iTwuzYy8S2HV?=
 =?us-ascii?Q?oF78Wkp9rFHDQf8isey/eJFLLnvGri7O5DczgS4yGnSHPVfhnYVSzaAgXfeE?=
 =?us-ascii?Q?/hYvoUIZ8EfEOkD531B0956v0Gn1SkgXanwCkUxExhs5Uk8rK3eX7q0QHxrT?=
 =?us-ascii?Q?8YduaKwojGRSmFvXlYykSSU+F3I6d8BIgPmTVD2tl9bqqTx5inJoH0uIjokf?=
 =?us-ascii?Q?6SIexbK1z6LBdu2gTN4K4tcQA7//52cOHNvQR3xoYKe/aba2cawFjo2yOsA6?=
 =?us-ascii?Q?/TzFazTzrQEMx8+9i95FDCscoAmpD4TytG+tlZwdVuW8dVJwzWbrHOIC6EQc?=
 =?us-ascii?Q?xAGjdyfPuX4fWDjQCecaGsBsSRGwtPg0wgFOsxG3Xl26nKeDH5Q+SwBnr8ww?=
 =?us-ascii?Q?Q7D5RYrGqnjHpG/gX3fLGkV/ypR+Khs2FX6U1fFuowfFjybAWrsDkt7JikNY?=
 =?us-ascii?Q?dWUevh4DO1QadllhiOvtvgV3gQzEtwjesXvkej5rp8jHuRKHcd72dlWOCOE6?=
 =?us-ascii?Q?l5skmGj8FW4P4YJla+S72mWjIArF29ljejdPkzccplUFQD9HOIZiEBZYenbe?=
 =?us-ascii?Q?Np/Qv9F+XJyJ9fVBIDy2w3pfsu1Klwx+4xXd2ChMqda+5itbYVY0u/OPKip2?=
 =?us-ascii?Q?g1qFJgYRuPJJDrDmlukoC+qUIcRZ0dDeqtyyK3YbE053Vy4RmZKlryIpyOtD?=
 =?us-ascii?Q?KnFCmLp2vrgXB+mZguE8nM2NAQislGg44yf0ySuczmdI+6iqV7DnadZ0Xmmf?=
 =?us-ascii?Q?KURciCIC0ziSGUdU9iZNe9hq85HpAlRJZ2WKwJXYStAITGZQEWTMDp6f9L2t?=
 =?us-ascii?Q?2fzhB+4qwgi2eMS5Izu9y8oMLG8RfB1054nFq/UTg6n8YRelNAsbBhyxZPRM?=
 =?us-ascii?Q?qCcd1zvsiXbGo25bykjX6ZYB0A5zu5LLwp/2uX/OnEVUQLHZcuryCZgCyWeG?=
 =?us-ascii?Q?8mBjtL9aLQvI1CsEX14HEhjCX2qVupQXYjT7MsF2KpV5O8ZrRRtlNk6a2VjC?=
 =?us-ascii?Q?HU+JXtVX6W7WYejkGMJUmOH87o4VX4C1SA+lLxeYhC6gmcsPQZ1bRRcTWpQd?=
 =?us-ascii?Q?4Cr9oQ//YfK03Eyu7Lc=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4433da78-0951-4cd1-87ad-08dc07098e0f
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:28:00.1915
 (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: u0VLNrNOedlG1hJFrvsJ1sZxbdLxrn2ocsaeElti/S3dbI1734rtSJTspIG5AW7JE5l+49YqASU9V1LqLeMNSA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9050

Refactors the phy handling logic in the imx6 PCI driver by adding
IMX6_PCIE_FLAG_HAS_PHY bitmask define for drvdata::flags.

The drvdata::flags and a bitmask ensures a cleaner and more scalable
switch-case structure for handling phy.

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

Notes:
    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 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 50d9faaa17f71..4d620249f3d52 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_PHY			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_PHY)) {
+		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;
@@ -1444,13 +1449,15 @@ 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_PHY,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
 	},
 	[IMX8MP] = {
 		.variant = IMX8MP,
-		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
+		.flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
+			 IMX6_PCIE_FLAG_HAS_PHY,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
 	},
@@ -1462,12 +1469,14 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 	},
 	[IMX8MM_EP] = {
 		.variant = IMX8MM_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
 	},
 	[IMX8MP_EP] = {
 		.variant = IMX8MP_EP,
+		.flags = IMX6_PCIE_FLAG_HAS_PHY,
 		.mode = DW_PCIE_EP_TYPE,
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
-- 
2.34.1