Received-SPF: pass (google.com: domain of linux-kernel+bounces-192960-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 28 May 2024 15:39:18 -0400
Subject: [PATCH v5 05/12] PCI: imx6: Simplify switch-case logic by involve
 core_reset callback
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240528-pci2_upstream-v5-5-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?TjVCY2JqVGZYblZJTEhQbU1Bdm9LOG1oaW9jcDBPU3h6YzVwRi8wSEFjS29J?=
 =?utf-8?B?SnFrSW9nNXlzcndEcWprNXFoSWU3cVcrOVdhQ3ZnOG9rRUxYN2VlRVhFc0tN?=
 =?utf-8?B?ZSt0Q2pjbzdwQnhJMkZyc3dVWnVvSmhtUkVIZzYycTFEd2VjU1k0QVl0OUNj?=
 =?utf-8?B?d2hHTy9GbzI0OTdpcDBESHk4N0owWkpKc2Z2N0hiSTRuSWZudE5Qb0hkOGk5?=
 =?utf-8?B?K2NQTm8wRVhWRFFYemljK2QyNmlnTGNreE8rOXhPNGhOZVV6NWR6ZU1QbFVX?=
 =?utf-8?B?am15UnpUMlpERVFoWG9VOEFuMTRUOC9XZXNvOVpHWkZzM25FVkhxU3hWRjlR?=
 =?utf-8?B?V3A4Y0ZyZzZ3Q1BxL1lGZzl1TGhyTzBRRC96L0h6a1dKdGFEd1ZpeGFsaHNn?=
 =?utf-8?B?N1owYjMrcVRSMFNkREt3a1ZxN3VsVUZVaDQ1a3JHR2FsREZrQ0QwZllOOTV1?=
 =?utf-8?B?WUxQNHRLR0w1bmtvd0hsREs3T3Ftc2xMWFJxMUpoTkkrYXpZOCtlOHl3ejhU?=
 =?utf-8?B?WVNkMjlKdjFzeXdrNlF1QjFJYXpNMGVRa2wrd2lGRzQwa3ZYUmFXYWlzcDU4?=
 =?utf-8?B?MDM2ZlNwbHBObkQ0dk1jOVBGeEd5QzFwd2IycmRkbDh3d2svK0EwMFAyUUo3?=
 =?utf-8?B?Z1RKRVZXbGNENVpaTlRnZ0syS0FlakhYdjBYUHNLazRpZGljY3hWSGltV01j?=
 =?utf-8?B?UWZPTnFJbERReHF4M0xzaWdVbkYwVXAyb2xqSzJqK212NCtqVE91Qi92Zmg0?=
 =?utf-8?B?WW1HM2lWaHlUeHZ5bkRQeG96N21OWERyL1ZrMWpYS2MrbExHdFRNbWU4MS96?=
 =?utf-8?B?QkJjay9nWUhiOE8xTXUySFZYQmh3aWgwRmh4U3puTkNQNVhRZ2t6WFU3VHlz?=
 =?utf-8?B?TzhHb3dhd1Flb2p1SmE3bzcrdGhra2FxK0F1Q2ZGbThodVJ4aldGRC9wbUt2?=
 =?utf-8?B?akp0SndUTFQ4eTl3UHNjRHdxSnI4TkdianB3RjhQbjNMRDRYVFdzcGRlY1NJ?=
 =?utf-8?B?YWdPY25MM1Z0Q2hUWDNnSmVaRENpN0w0dVh4cEhiZ3lNZWhZa2VFS3RvWXRy?=
 =?utf-8?B?RTBmYkJKZXRnQ2hOM2lGaHZQNFlTczVCbnhIMEZ0QndubHJqQ3M2Q2VWaU9N?=
 =?utf-8?B?Rm5KWldBYjVaSWlhdTd5L0FoZjdOc1NnUmxtNHQ2NFdCNVB0L3k3eHFWb0ZQ?=
 =?utf-8?B?YkR1VmxkRHhwZ1pYNWdWZXZJbzdrZ003SUlSMWFDR3V5ekhOYitzSUlndGlM?=
 =?utf-8?B?TXNQcEU5UlF6TitGWEJ0eGZYdUMxNnNrakVrd1Ryd3ZxYXNUQlpkckdNSFhO?=
 =?utf-8?B?SHZheGRLQURLZ1d6VVRRc0p2bEo2VW4rR1NIYUJtOW1KY2FlYjY1bGwzbFNr?=
 =?utf-8?B?QzJLTzQ5cTh5ZXZqd2VlMU5NajN4eE5YWEEvdWZaVElic0JGTWdqdzB1SXdk?=
 =?utf-8?B?c0MxeEhycGx4M0NaYWNQV3I3NkNRR3BoMjB4K1MzOEpBbXZVQWtvVm91Q1cw?=
 =?utf-8?B?NmJOL3dDYTdIS2lPU3FubHEwdTZnMUt4Rk8wWXNWdE9DMGFIT2wzYjFaaGhC?=
 =?utf-8?B?dWZoN210bzVJWHJXNGU3ZHdlMGZDVlJmOTUrUzBEa29OUFhwSVJPYlRBOVNV?=
 =?utf-8?B?bG1KYytGb2RaNUFsNjBRV0dSdUtlc05QUzBrZi9CaHVtZWVpREdRZHduM0lp?=
 =?utf-8?B?U3hDN0sxOGFJUnNuS29QU1FnYzU2NHY5dWt3dzREWkZkQjlrdS9GT1BQTHFN?=
 =?utf-8?B?NURGVHl0UlN6TG9pL1RmZTBSL1RnQ1k2L1ZSeWpYSE1SNDEvY2cyTFdLekI0?=
 =?utf-8?B?cU5jaUs0ekdSRnVwMWxMM0lhallBc0N0MmgrVmFmNjBtMU82VVhPU0E1T3Js?=
 =?utf-8?B?L2RhTmFiQXdvSU9Nc2c2V2UwWXlDOE5xMkt1K2NDZEx0Q0psWXZZZmNrTGpW?=
 =?utf-8?B?eWZUdm80bCtGeVFFV0ZkZk5TaGlMdVBYZE5wOE9JRVd6cVNMR0Rxd0hSQzZF?=
 =?utf-8?B?aHJFVFRDVTAycGhiUXFTRjVCV1BsTk9ZaElRYTlLcENTMVNuMytaZ2w0d2ps?=
 =?utf-8?B?cVNSNGhjaGU3WlJOVm5ZaW1Ub05kRXRUajRIUTR6QVdUaTZMcmtFT2FleUdW?=
 =?utf-8?Q?cDXE=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 57dd02ae-a9d1-43db-2130-08dc7f4df3a2
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:39:55.7303
 (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: JKDnMsHbXnIzYKgIHOB3OD+pUeO+2mVafYHJ3gz+1W1BcqCOgxbJItR7vn8TtNQoQ750cV8b3qabA8h7fvMkaA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8655

Instead of using the switch case statement to assert/dassert the core reset
handled by this driver itself, let's introduce a new callback core_reset()
and define it for platforms that require it. This simplifies the code.

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

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c5d490afa981e..5e21fc942e90e 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -103,6 +103,7 @@ struct imx_pcie_drvdata {
 	const struct pci_epc_features *epc_features;
 	int (*init_phy)(struct imx_pcie *pcie);
 	int (*set_ref_clk)(struct imx_pcie *pcie, bool enable);
+	int (*core_reset)(struct imx_pcie *pcie, bool assert);
 };
 
 struct imx_pcie {
@@ -670,35 +671,75 @@ static void imx_pcie_clk_disable(struct imx_pcie *imx_pcie)
 	clk_bulk_disable_unprepare(imx_pcie->drvdata->clks_cnt, imx_pcie->clks);
 }
 
+static int imx6sx_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
+{
+	if (assert)
+		regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
+				IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
+
+	/* Force PCIe PHY reset */
+	regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5, IMX6SX_GPR5_PCIE_BTNRST_RESET,
+			   assert ? IMX6SX_GPR5_PCIE_BTNRST_RESET : 0);
+	return 0;
+}
+
+static int imx6qp_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
+{
+	regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_SW_RST,
+			   assert ? IMX6Q_GPR1_PCIE_SW_RST : 0);
+	if (!assert)
+		usleep_range(200, 500);
+
+	return 0;
+}
+
+static int imx6q_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
+{
+	if (!assert)
+		return 0;
+
+	regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_TEST_PD);
+	regmap_set_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_REF_CLK_EN);
+
+	return 0;
+}
+
+static int imx7d_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert)
+{
+	struct dw_pcie *pci = imx_pcie->pci;
+	struct device *dev = pci->dev;
+
+	if (assert)
+		return 0;
+
+	/*
+	 * Workaround for ERR010728, failure of PCI-e PLL VCO to
+	 * oscillate, especially when cold. This turns off "Duty-cycle
+	 * Corrector" and other mysterious undocumented things.
+	 */
+
+	if (likely(imx_pcie->phy_base)) {
+		/* De-assert DCC_FB_EN */
+		writel(PCIE_PHY_CMN_REG4_DCC_FB_EN, imx_pcie->phy_base + PCIE_PHY_CMN_REG4);
+		/* Assert RX_EQS and RX_EQS_SEL */
+		writel(PCIE_PHY_CMN_REG24_RX_EQ_SEL | PCIE_PHY_CMN_REG24_RX_EQ,
+		       imx_pcie->phy_base + PCIE_PHY_CMN_REG24);
+		/* Assert ATT_MODE */
+		writel(PCIE_PHY_CMN_REG26_ATT_MODE, imx_pcie->phy_base + PCIE_PHY_CMN_REG26);
+	} else {
+		dev_warn(dev, "Unable to apply ERR010728 workaround. DT missing fsl,imx7d-pcie-phy phandle ?\n");
+	}
+	imx7d_pcie_wait_for_phy_pll_lock(imx_pcie);
+	return 0;
+}
+
 static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie)
 {
 	reset_control_assert(imx_pcie->pciephy_reset);
 	reset_control_assert(imx_pcie->apps_reset);
 
-	switch (imx_pcie->drvdata->variant) {
-	case IMX6SX:
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12,
-				   IMX6SX_GPR12_PCIE_TEST_POWERDOWN,
-				   IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
-		/* Force PCIe PHY reset */
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5,
-				   IMX6SX_GPR5_PCIE_BTNRST_RESET,
-				   IMX6SX_GPR5_PCIE_BTNRST_RESET);
-		break;
-	case IMX6QP:
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
-				   IMX6Q_GPR1_PCIE_SW_RST,
-				   IMX6Q_GPR1_PCIE_SW_RST);
-		break;
-	case IMX6Q:
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
-				   IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18);
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
-				   IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
-		break;
-	default:
-		break;
-	}
+	if (imx_pcie->drvdata->core_reset)
+		imx_pcie->drvdata->core_reset(imx_pcie, true);
 
 	/* Some boards don't have PCIe reset GPIO. */
 	gpiod_set_value_cansleep(imx_pcie->reset_gpiod, 1);
@@ -706,47 +747,10 @@ static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie)
 
 static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie)
 {
-	struct dw_pcie *pci = imx_pcie->pci;
-	struct device *dev = pci->dev;
-
 	reset_control_deassert(imx_pcie->pciephy_reset);
 
-	switch (imx_pcie->drvdata->variant) {
-	case IMX7D:
-		/* Workaround for ERR010728, failure of PCI-e PLL VCO to
-		 * oscillate, especially when cold.  This turns off "Duty-cycle
-		 * Corrector" and other mysterious undocumented things.
-		 */
-		if (likely(imx_pcie->phy_base)) {
-			/* De-assert DCC_FB_EN */
-			writel(PCIE_PHY_CMN_REG4_DCC_FB_EN,
-			       imx_pcie->phy_base + PCIE_PHY_CMN_REG4);
-			/* Assert RX_EQS and RX_EQS_SEL */
-			writel(PCIE_PHY_CMN_REG24_RX_EQ_SEL
-				| PCIE_PHY_CMN_REG24_RX_EQ,
-			       imx_pcie->phy_base + PCIE_PHY_CMN_REG24);
-			/* Assert ATT_MODE */
-			writel(PCIE_PHY_CMN_REG26_ATT_MODE,
-			       imx_pcie->phy_base + PCIE_PHY_CMN_REG26);
-		} else {
-			dev_warn(dev, "Unable to apply ERR010728 workaround. DT missing fsl,imx7d-pcie-phy phandle ?\n");
-		}
-
-		imx7d_pcie_wait_for_phy_pll_lock(imx_pcie);
-		break;
-	case IMX6SX:
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR5,
-				   IMX6SX_GPR5_PCIE_BTNRST_RESET, 0);
-		break;
-	case IMX6QP:
-		regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1,
-				   IMX6Q_GPR1_PCIE_SW_RST, 0);
-
-		usleep_range(200, 500);
-		break;
-	default:
-		break;
-	}
+	if (imx_pcie->drvdata->core_reset)
+		imx_pcie->drvdata->core_reset(imx_pcie, false);
 
 	/* Some boards don't have PCIe reset GPIO. */
 	if (imx_pcie->reset_gpiod) {
@@ -1442,6 +1446,7 @@ static const struct imx_pcie_drvdata drvdata[] = {
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 		.init_phy = imx_pcie_init_phy,
 		.set_ref_clk = imx6q_pcie_set_ref_clk,
+		.core_reset = imx6q_pcie_core_reset,
 	},
 	[IMX6SX] = {
 		.variant = IMX6SX,
@@ -1457,6 +1462,7 @@ static const struct imx_pcie_drvdata drvdata[] = {
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 		.init_phy = imx6sx_pcie_init_phy,
 		.set_ref_clk = imx6sx_pcie_set_ref_clk,
+		.core_reset = imx6sx_pcie_core_reset,
 	},
 	[IMX6QP] = {
 		.variant = IMX6QP,
@@ -1473,6 +1479,7 @@ static const struct imx_pcie_drvdata drvdata[] = {
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 		.init_phy = imx_pcie_init_phy,
 		.set_ref_clk = imx6q_pcie_set_ref_clk,
+		.core_reset = imx6qp_pcie_core_reset,
 	},
 	[IMX7D] = {
 		.variant = IMX7D,
@@ -1486,6 +1493,7 @@ static const struct imx_pcie_drvdata drvdata[] = {
 		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 		.init_phy = imx7d_pcie_init_phy,
 		.set_ref_clk = imx7d_pcie_set_ref_clk,
+		.core_reset = imx7d_pcie_core_reset,
 	},
 	[IMX8MQ] = {
 		.variant = IMX8MQ,

-- 
2.34.1