Received-SPF: pass (google.com: domain of linux-kernel+bounces-84068-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Frank Li <Frank.Li@nxp.com>
Date: Tue, 27 Feb 2024 16:47:12 -0500
Subject: [PATCH 5/6] PCI: imx: Simplify switch-case logic by involve
 core_reset callback
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240227-pci2_upstream-v1-5-b952f8333606@nxp.com>
References: <20240227-pci2_upstream-v1-0-b952f8333606@nxp.com>
In-Reply-To: <20240227-pci2_upstream-v1-0-b952f8333606@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>
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, 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?eWp5RUplVS8ybmVlbFlZZ0cxZkJ0TjRiWEU4S2Y0cGJ5amZXLytpQzEranUr?=
 =?utf-8?B?cWNWOFkyMER5UmtFVUFVM2FSeVQ1OGFnUUp0MGdOWEhSd1dDNmMxL2JROFQ4?=
 =?utf-8?B?OGFNcWk4elVPTDB1RTkzVmRXdjlDeXBXUTRaVEltUDJVNnVMNFV1bGZCK2Vn?=
 =?utf-8?B?RGpsQmJwRXV6ZFdtYXVQci9iZ1BkMXFzOFVvUG9VL1RpNkpUT2RKUGNlMUtr?=
 =?utf-8?B?RCtPT09sSGZVc1pzN2R4N3NSTjN4NU0wOEJrT2xpOEIxb04raFVBKzlySk1x?=
 =?utf-8?B?anQ5YmgwOTdoWjUzOHlsd0MyZ1lYWGxaeEI4NDhJTUMrdmJncFlGVWtUdW5h?=
 =?utf-8?B?MGxsblozajg5elFSTzhLU2prblkwK1lzMXk3bFNCWlVGYXpXN0F0Ti9HQVBn?=
 =?utf-8?B?WWplc1E4Z3NsUXBsWVd3bXFQaDZMOTlwY0dRUmxQVnMxV2FsYlN0ZTJwS3N1?=
 =?utf-8?B?TDFrMysxbGsrbEFxUDZOUHA3dDZEbXRmSk1GRmhCSStrM0pwNUFNVjhOK2Iv?=
 =?utf-8?B?RTZPbWdza0RxWU5CNEtiQkh5WlU4WXNRNVM3dW9wUU9Vdk1vNzNXUVpLTUd1?=
 =?utf-8?B?ZlNsWjBqdFZNaEsxTjZhOW50QWJOVWEyS1gveGVUMTB0Q2g3dnpQOFN2U3Jq?=
 =?utf-8?B?d29YaVZGR2dhSzg5ZE5wbFlLQXZNNTNyNHFKMjZSZmo1UG9scWFoaVU1YmVk?=
 =?utf-8?B?bHdzSlRqNkFsNEZNUm83U3pZd3RnZzNpb1NSVEkxbXJOK29JN0RvS1FTQWVT?=
 =?utf-8?B?emxaaXkvQ003TTZWaDdsSFIrQzNEVU8xT3IyRkdqRDNaN1VxYWVoYWpTTVpN?=
 =?utf-8?B?WG0rRVlYUXA2U250SndubUdYRStBVkRDWFduZVRkQzBaR2xITkI1am4yUXcw?=
 =?utf-8?B?R0QxSHlSVC9kOGJIejJxSGY2ZXFibmY3bUFodUp0UFBJUWlLUThiUlpBblhH?=
 =?utf-8?B?RHFYb3pPU2hVTTVNL25kQlFzR3ZsMXROSHNHbHlBNk8ybHhQQ1JQR2YxNFhw?=
 =?utf-8?B?a2ZTVHErNzZTNXFmdzNHQkpDdHBoOUpTd0Z4b0t3ZkRUc3hhWHZhYVVKTEJr?=
 =?utf-8?B?ZXRJMFVjZjNtODZGeXc2dlpRLzBjV2NGMHlVZ1czMnVVZUw3OGFJMmxtSnlO?=
 =?utf-8?B?RThQY01US0QxSHV1UXdwb3BCdng5MHpVa0xwNU1iR1RPNVdFanBLMkNoRzNK?=
 =?utf-8?B?NmFIczRQV2RVWWdEcW1wcStMUXd2QS9HcnZ6cm1LV2grMzZRTGpkYTN1RFVo?=
 =?utf-8?B?ZkNBc0hyUGZxZnpFdEpyRXUrNDQvc1FiM0U3OG9GRWZoY1hBbXVaUm50UXZS?=
 =?utf-8?B?bUNYbGJKT3c5NjVTMThzRzk0eVAzdnRPTDh3K1AwY2Mzc2wwVVNMQXpxZE9t?=
 =?utf-8?B?bS9YeDZPSHA2WmcrTXJnY0pFYTVpWHloTDI0UEN4ck5LN1Y0d0NaSGxqVFlL?=
 =?utf-8?B?TjFLZ3IweWJPblh1UFNVcnJoaFE4alp0cXVISURic3RDNTlYUXdLM2lWSFBv?=
 =?utf-8?B?N3RQWTJkdUdCYlF3QUlIZENJT3lQQWpaRGRZMnRJSUFKMmI3UHR4OXZVWVpj?=
 =?utf-8?B?NEhuVTVLd0E1S3JSeXA1SzNFVUEra2RiQ05uOFhWNXZYVVIvdmVlbndoQXNq?=
 =?utf-8?B?Z2tESFhxbkJtT3NpcjhGa0dsNzlmNjBqczVtekMvWk11Y2NJQVlNNys1RElK?=
 =?utf-8?B?ckNTQnpiNytBOGlUZEVJdG1MdkdwY09ETUhoWXprdG1XSGdaYU9MVlJtSDAz?=
 =?utf-8?B?djM5cVZnQ1ZCZ2NpRCs1dWRnYVBXandScFg2ZWIyS3Zld2JiTjVsYW5qbkRK?=
 =?utf-8?B?SHBVYkVrM1BjVEpwdnczdXBXbi8xVFdNenZtYnBLRnI0SGF3QnRLNFFVWUor?=
 =?utf-8?B?V2VHTVVPQXRGOVdRUjViRXBIbUNRaVEveU80aERNWjNGdkVPcU1PSENXUitD?=
 =?utf-8?B?emlqQTk0K0pJLy8xcVc4YUNtb0daZFlDcmxnM3lHWmF4L0xMQmFGRjJLWWtX?=
 =?utf-8?B?Z3pIUTMvMXVsWkllM1A4THk5VDVQMi91bmpjaVhnUmorV2NrdUNnZnR0cjNF?=
 =?utf-8?B?YVZtNE5SRGtkUlB6ajdPN3JYbmR0RnkwT1J3VTFyNEZzbHFPUWlCUVIxUnYr?=
 =?utf-8?Q?iuH+HzCAcLSaB6+CjRdnS9Ffs?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a63c23e6-4fe2-4d5d-4237-08dc37ddc215
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 21:47:56.4482
 (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: raxxcEE1xBBdwBPf/0HjDCRJHeRrm6f9M+hjpL1G0u/EXoidgkRDrzZkU13h5nYP6EdVMnUoRzzW7TM59wnS4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7056

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

diff --git a/drivers/pci/controller/dwc/pci-imx.c b/drivers/pci/controller/dwc/pci-imx.c
index a63ce171ede8f..460d40115935b 100644
--- a/drivers/pci/controller/dwc/pci-imx.c
+++ b/drivers/pci/controller/dwc/pci-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)) {
@@ -1444,6 +1445,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,
@@ -1459,6 +1461,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,
@@ -1475,6 +1478,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,
@@ -1488,6 +1492,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