Received-SPF: pass (google.com: domain of linux-kernel+bounces-128151-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 02 Apr 2024 10:33:43 -0400
Subject: [PATCH v3 07/11] PCI: imx: Simplify switch-case logic by involve
 core_reset callback
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240402-pci2_upstream-v3-7-803414bdb430@nxp.com>
References: <20240402-pci2_upstream-v3-0-803414bdb430@nxp.com>
In-Reply-To: <20240402-pci2_upstream-v3-0-803414bdb430@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?OUJ3czdaMGQrNVNLOFVoZ3lReTVIYy8yMHRlUEpoUGNaUC9SMVRZeDllWEF0?=
 =?utf-8?B?ZHVIa3VuM1dBQSt2WWFXQTQ2UGlPRlNNZmxMQ1R2anNzTmQyckJadUo5bjl1?=
 =?utf-8?B?andBcitqV2pnblNnZFN1cERLYVJVcDJobmV0MXZzQlNJSTgyTGVadnY1M0FZ?=
 =?utf-8?B?RHJDcjhnMGJwUzVwcXBBOGZ6UUVEaXRkbjl4MjBLVDdyUVplbCtESEN4bTNi?=
 =?utf-8?B?Tlk5K2QxbHQ1OEpxcE1QRk1TeFh3TEtkRzc2ODlZNlZWZlBnWlNYNmZLRTVB?=
 =?utf-8?B?dUV5RkNoZ0IxdXA2Rm1JVURHc3RyS3NZWU9SNFlpek5zd0ZhbWNjMEJkcHJT?=
 =?utf-8?B?YUxOaEZjdXYvQW5WUEJ4cjVMVEoyWHdxc3NRdDdMMlA3V0xGOFBmV2xGeld3?=
 =?utf-8?B?VFhGQncvbGhnQ01aK2JjcVNIaENXeHdseHRZUDJzd2lnN1p5ODdmcDIyM29P?=
 =?utf-8?B?UTJVeDU5ZXVpamkxNXZCZmVtSkFCdmZRRTFCa2N5VjFQTzBWVWJuczVQV2RN?=
 =?utf-8?B?U3JTM1F3T0hmeGx3UUxlUmJHREczRzJtc3lCL3dCVXl4YytFQWJkQXdBbHJN?=
 =?utf-8?B?YnhNZzluUmtqK1cxMzFWZHdZOXVGQnF0RkdEajZ3U01LNkxCNFB4QWtCZTVH?=
 =?utf-8?B?cm1uSUoweHpFU0RqSTJkY29HVnVqbjhBQnVYa3gwQmdHTHhidS90dDB4L1E4?=
 =?utf-8?B?NURZMzZHWVB6Z3hnZDJHTnpaeVpFWjI0UWlsSEZqU2dUNGVHdS8vTzRKU241?=
 =?utf-8?B?ZHRVdWdOQjZqRzVqVkpJNEwvcUxNcGJSNTZ5L3FUV2IwTHVhVUlScGZsMGEx?=
 =?utf-8?B?aExzdlVzQm5CYTVKQ2lVSlQzRm8yeVdzNFJOSTBYMW5ONDNpU0l3ZDlFSUlU?=
 =?utf-8?B?V3RKV1loWllhSGMzSnhpRE1KcHQrMExXa0ZKeXNNbGUyTkFxcmVUOGdNT0Y0?=
 =?utf-8?B?NkVKRW9BQXFYcGEyQlpFVlV3bk95MXdRMXNyZmtlSWxDWGU1UXFIdGVydkNO?=
 =?utf-8?B?aTZUbTIyWFRwZDVvckQvcmd1RlN0M2tFaldGSmE5MnR6WHU5VVlpNC9xa2xh?=
 =?utf-8?B?ZlhHSVZhZWRsdmwvV0kraFdsYUFCbDZsdStYd2xyRkpLd25ZQ0xJVmVmTmZ0?=
 =?utf-8?B?aXVla1EyS1FOZXpuZEZLUmxGL1k3MWNoNzNtMjBoSGFJU01Gd2lxRFF3alNv?=
 =?utf-8?B?SCsxalpKM0RWdEU5SjMyLy9NTlRZN0JXVWkxOGxwT2VxTUk0QjRxNncwSml6?=
 =?utf-8?B?eGFyQ1REVWtFWXRpTXNjOXZUUDhJcHhKWFN2SVJtVGM3dElFM2xTNWl3bU9v?=
 =?utf-8?B?ZGQ1WlkvRmdoemp1dktyQ0hLSGtVSzZPSFRPcnNDY0M0QUk1bXRCK2IwZDhW?=
 =?utf-8?B?QzNYcmRWK2dieDk5dnVBY2lld1cwM0g1bVFpQWI3eU11bmEzM1V5bk0wZ3Ax?=
 =?utf-8?B?dTlnaGk1V3EvZjM5L0NzVWF3cGJVcW9WRzhObWJJcjdsUVNpaFRKcDN0OTV3?=
 =?utf-8?B?T1ZEeUZxUjFSMEQ3R3hpYnNZQm1Td1RkWXNBWjRQQkt2ZXNQdlZENTVMN2hB?=
 =?utf-8?B?WHZrV0hzOC9mS3ZnSjBtU04xRlBMZEhRN1BSTFE2WWpEZnM0RnQrQ1lONlRW?=
 =?utf-8?B?U2FHZ2FROEVlTVhpRloweGdQZGV4R3hXbDNvdHRRaVlzNUt6OFVPR2V5Y1NU?=
 =?utf-8?B?cEVHNjdZby9Ebkl6Q0FYUHpYV1ZiR05iOTFvU045Nlh3R0RpKy9iYUZxbHp4?=
 =?utf-8?B?K3l5a2Ntdm1TR1Fzb2pDRjc4bFlwUmxSMjRSUGVRa0xONGZXakkyOUFoUUFr?=
 =?utf-8?B?a1d6MThDTUhzUjFRbnk5TmdJMlMzWXRyeGltbUF4c0d2cmRiWjZGNVNWazZv?=
 =?utf-8?B?bnpnLzdYblRxSmswYlNzMXhqNnVLN3Zpc0l5Sjhra21MWEpkWmVMcVM1SU1v?=
 =?utf-8?B?S2lERlNyRjVDNzZUbVBWR2c2MSt2cGpjN0RsM0h5d3d6ZmxVQXFyUXdZSFFo?=
 =?utf-8?B?SjQ0ZDZxRXBpT1NGMzB0aVVmNWF4NkkxRmtDU2tqMnhERlF0QmgrT1hXNFBq?=
 =?utf-8?B?WTg3cHNYZElnaXl0SlBHaUZUZ0dHTzlwL09kOVRTNTVZRWtRbEpiN0R3Yi91?=
 =?utf-8?Q?AkPQ=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f937455f-d1f3-4093-05bf-08dc53220354
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 14:34:33.0867
 (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: KLS89qlMGFhVBjGXigtv15AJ7oaxm9xFEkFvUXCAn12ffiydEt9HqqwwLGMdU8iRMw6Gs5SJixQwbK6aQbM94Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8926

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/pcie-imx.c | 131 ++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-imx.c b/drivers/pci/controller/dwc/pcie-imx.c
index 77dae5c3f7057..af0f960f28757 100644
--- a/drivers/pci/controller/dwc/pcie-imx.c
+++ b/drivers/pci/controller/dwc/pcie-imx.c
@@ -104,6 +104,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 {
@@ -671,35 +672,72 @@ 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)
+{
+	regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_TEST_POWERDOWN,
+			   assert ? IMX6SX_GPR12_PCIE_TEST_POWERDOWN : 0);
+	/* 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)
+{
+	regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_TEST_PD,
+			   assert ? IMX6Q_GPR1_PCIE_TEST_PD : 0);
+
+	regmap_update_bits(imx_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_REF_CLK_EN,
+			   assert ? 0 : 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. */
 	if (gpio_is_valid(imx_pcie->reset_gpio))
@@ -709,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 (gpio_is_valid(imx_pcie->reset_gpio)) {
@@ -1447,6 +1448,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,
@@ -1462,6 +1464,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,
@@ -1478,6 +1481,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,
@@ -1491,6 +1495,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