Received-SPF: pass (google.com: domain of linux-kernel+bounces-192966-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 28 May 2024 15:39:24 -0400
Subject: [PATCH v5 11/12] PCI: imx6: Call: Common PHY API to set mode,
 speed, and submode
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240528-pci2_upstream-v5-11-750aa7edb8e2@nxp.com>
References: <20240528-pci2_upstream-v5-0-750aa7edb8e2@nxp.com>
In-Reply-To: <20240528-pci2_upstream-v5-0-750aa7edb8e2@nxp.com>
To: Richard Zhu <hongxing.zhu@nxp.com>, 
 Lucas Stach <l.stach@pengutronix.de>, 
 Lorenzo Pieralisi <lpieralisi@kernel.org>, 
 =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= <kw@linux.com>, 
 Rob Herring <robh@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, 
 Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Fabio Estevam <festevam@gmail.com>, NXP Linux Team <linux-imx@nxp.com>, 
 Philipp Zabel <p.zabel@pengutronix.de>, Liam Girdwood <lgirdwood@gmail.com>, 
 Mark Brown <broonie@kernel.org>, 
 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>
Cc: linux-pci@vger.kernel.org, imx@lists.linux.dev, 
 linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, 
 bpf@vger.kernel.org, devicetree@vger.kernel.org, 
 Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?Z01IdE96WGFVN1NRMDl4V2cwd0RiNThzaTl4T043eWtiWUZaQ0lTN1NwUnM4?=
 =?utf-8?B?SUFYYjJMdlp3ZHA2VEJYa09YKzNXSW0reDMxTFcxYUxpVjc0aGpqS3ZiaHJq?=
 =?utf-8?B?M2E5SXhHWkFoSktkQmdiWVlKNFlTSTB3VEdiRUhQc2FhN1g1SDdkUFBOMDJ0?=
 =?utf-8?B?VUFwU2NLaUpwektkMVJwSENBVFdYeGxJTE1ZamJEbk54N2dwQ0M2Tk1td0xD?=
 =?utf-8?B?SUZDVkdRa2lXR09JL3p5Mk5xekZDUm1XUzdtWTdJL3dLK2lTVlUwTUFFb0hh?=
 =?utf-8?B?UUJ2YTQ5djNid2V4SWNqN2lqbFdUSVBrTUJZM2oweDI0S0tZdWduNjFHZyt5?=
 =?utf-8?B?b1RJTDZveVoxbStyTy8zTkJ6SzNJUFdoeENiMWdWdTg4VFUzV0JNU2p6ZDVk?=
 =?utf-8?B?dzQxb282cXFRSTEvdjRtU21JR1Yvcy9Wb1J4dGNuVkYwcFdOUDBBa3l2RUhh?=
 =?utf-8?B?WXRrOGJqSmZGd2NmSlFjSzRtaFhMSjNlVkZoSXV5ZHRxRDdDV0tYbFY4b3hG?=
 =?utf-8?B?VTRUMHJEa2VBYjl6U2x5S2VYRlhaYnlhNTZrdnQ0Z1liUmMyM2NtU0FsaFVo?=
 =?utf-8?B?aS9wcGsvdytTeDZwRFprZWwvZDFSSk1uVHVsNllvRndtcVJ4bDlFanl6NVpG?=
 =?utf-8?B?M0Z1TGdxcjQwOHRXV1BFYUNJOVI3REJLdUQvN09udytKWkxQVXo0dDZQelo1?=
 =?utf-8?B?dGc1Yzc5dUZZTnpENml6eVRnYU91VUxrZVZTVmpGNVlCZm8vNXZCUkNycUp6?=
 =?utf-8?B?RjdnWDVudEpYVFhNbWhlNVUxVHBMMWhIaHkwUWp3Smp0Q245Z2pUd1l0TGJa?=
 =?utf-8?B?eWlSclVzSDFNTmJoUHd3QmN5NTB6RWt1Mm1KeDB4MXgzaWpXVTBWeFgyMFBV?=
 =?utf-8?B?YVpFVkJFcVVBdzhtMjVRV0kzYS9DME5Id1J2REsxZlcrNEIveG0weXdscy9h?=
 =?utf-8?B?M2pnRFNJU2tTMG02aW9HV1JyWUlEeXRtZTR0Q28zQ0xJU29IM2JWNm0vcEZB?=
 =?utf-8?B?L1BXTjZQVDFUcDJKWEN1Vlc2STVwTWMvZklLTmEvdWVzbEFydUJNVWlKdjU2?=
 =?utf-8?B?NWFaV3NBQlJJYU1lZHpPOEIxMzFiODl5WXNtQWVqTkVFbGdTUVFnWWtTWDlv?=
 =?utf-8?B?Z0tNSkN4ZHk5QmRNeWtBa09WbW1YMGlhcEFNWE1Hejd1OVRVZlovZ0ZuajB5?=
 =?utf-8?B?NktJYnlpU0tMdlFHRHRXanhmeXViaGRqamxibEFiWEVXSUN1MEsyV0dFTUEz?=
 =?utf-8?B?emcvaTRwaEVqZVBDMW9TQXBrcTAxcW1RaWM2QUlPVXJqWEhQTVNsdGRMMi9V?=
 =?utf-8?B?SFVNb0ppaXhlRVoreVlDZVoxUDdNRUhQSUswUlBOVGpHemhhcWFZdkRQdmNq?=
 =?utf-8?B?a245THpPWFZCQ0dQSUNSN1VzUDllaS9wOHdSZjJRRjhOV25WYkRNNU42WXpN?=
 =?utf-8?B?QkNqa0tOMVNmeFhSRnlobHdBek5HWWlSb1cwRGY3dXd6c0JQU1VvdU5Salo1?=
 =?utf-8?B?UHBmMUMzWDhmRzZkSjNBWDBMZWhJWml4QThmMkxPTkRUMEJDcVhPakpkZGdm?=
 =?utf-8?B?cWMyemU3SXJZaFNQenVEeXlYOVhmUTZPRS81b2Y4bnVnVXJObmlGcG9zU3px?=
 =?utf-8?B?VThUQmRtaCszcVhVMVhjYVdKOC9JR1JWR0E3d2dqZFlOemN3Y3VPekFqRGp1?=
 =?utf-8?B?SkVDL1BNN21tTUJRcktSRDZCTnI5cUc4MUF4MkRFdGpWQXBTUG1RU3pZeUhY?=
 =?utf-8?B?WkFNSEp4OHlCeThNZDZuK0JRaHUxcllHeXY2M3Z4S1hLNEY1RVdNU2hZNFBR?=
 =?utf-8?B?b2VCNllPSlVQZ05Fa240OFpYM3dZWHdObFd3Uk10TVhROEZBOE8wTGROSnE1?=
 =?utf-8?B?b3NDeTlGdkdEOEZiL3JvZldYUnRlZjdPQjFoNENXTWU4SG5RdFZxQ1g2QWlE?=
 =?utf-8?B?RVAxVTBoUFVkeUdYV0dHbUtYY3FGTmpHRitRalVDaWV6Y0k2QVlIb0p6bUlr?=
 =?utf-8?B?ZkoweXlIZFNFRzAvL0hZMDlMYXJRd3ZQUzF5amxGcUNYdXM2Q3RucDB2Rk5K?=
 =?utf-8?B?anZsZHRncmcwQjFycUtRK2FSZVhxVUlVQ1ljUEJ2RzhGdjFheXF2NzB0emdY?=
 =?utf-8?Q?rNV8=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 79fd5fe2-77b0-4cb4-8cb7-08dc7f4e07f6
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 19:40:29.8185
 (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: h1VQtrhDKX2cmpwiC2F3hAPmxFkyoyZNh71uU7qhoSny+UEVCah9BVIWqLzqIyPvYTF25eif5TC+J7r/GkkiJg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8655

Invoke the common PHY API to configure mode, speed, and submode. While
these functions are optional in the PHY interface, they are necessary for
certain PHY drivers. Lack of support for these functions in a PHY driver
does not cause harm.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c8d58481f80dc..5a725ef6ed0cb 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -29,6 +29,7 @@
 #include <linux/interrupt.h>
 #include <linux/reset.h>
 #include <linux/phy/phy.h>
+#include <linux/phy/pcie.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
@@ -306,6 +307,10 @@ static void imx_pcie_configure_type(struct imx_pcie *imx_pcie)
 
 	id = imx_pcie->controller_id;
 
+	/* If mode_mask[0] is 0, means use phy driver to set mode */
+	if (!drvdata->mode_mask[0])
+		return;
+
 	/* If mode_mask[id] is zero, means each controller have its individual gpr */
 	if (!drvdata->mode_mask[id])
 		id = 0;
@@ -882,6 +887,7 @@ static void imx_pcie_ltssm_enable(struct device *dev)
 	struct imx_pcie *imx_pcie = dev_get_drvdata(dev);
 	const struct imx_pcie_drvdata *drvdata = imx_pcie->drvdata;
 
+	phy_set_speed(imx_pcie->phy, PCI_EXP_LNKCAP_SLS_2_5GB);
 	if (drvdata->ltssm_mask)
 		regmap_update_bits(imx_pcie->iomuxc_gpr, drvdata->ltssm_off, drvdata->ltssm_mask,
 				   drvdata->ltssm_mask);
@@ -894,6 +900,7 @@ static void imx_pcie_ltssm_disable(struct device *dev)
 	struct imx_pcie *imx_pcie = dev_get_drvdata(dev);
 	const struct imx_pcie_drvdata *drvdata = imx_pcie->drvdata;
 
+	phy_set_speed(imx_pcie->phy, 0);
 	if (drvdata->ltssm_mask)
 		regmap_update_bits(imx_pcie->iomuxc_gpr, drvdata->ltssm_off,
 				   drvdata->ltssm_mask, 0);
@@ -1029,6 +1036,12 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp)
 			goto err_clk_disable;
 		}
 
+		ret = phy_set_mode_ext(imx_pcie->phy, PHY_MODE_PCIE, PHY_MODE_PCIE_RC);
+		if (ret) {
+			dev_err(dev, "unable to set pcie PHY mode\n");
+			goto err_phy_off;
+		}
+
 		ret = phy_power_on(imx_pcie->phy);
 		if (ret) {
 			dev_err(dev, "waiting for PHY ready timeout!\n");

-- 
2.34.1