Received-SPF: pass (google.com: domain of linux-kernel+bounces-53117-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Frank Li <Frank.Li@nxp.com>
To: lpieralisi@kernel.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,
	krzysztof.kozlowski@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,
	manivannan.sadhasivam@linaro.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v10 04/14] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date: Mon,  5 Feb 2024 12:33:25 -0500
Message-Id: <20240205173335.1120469-5-Frank.Li@nxp.com>
In-Reply-To: <20240205173335.1120469-1-Frank.Li@nxp.com>
References: <20240205173335.1120469-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?0CxDP9fq4GDBaaNOpv47xNzcFSuKHM8vNHxHAkGezDEE6c8i9BuD592+Dt6I?=
 =?us-ascii?Q?OzXs4u1VtJ1DhzCAac7VJz8l4DANqjI1mCR57qCMSdOFAC1xiggVA5WkxU1/?=
 =?us-ascii?Q?nXiLYRuleIwx8TEtrI0w8a1k+3eeZLnVdV+ufLuziF3Qk4U7NpzChQKv28rO?=
 =?us-ascii?Q?OECxPlI8Z5f67pu8Xg/bYG6YU3JI96yGaXrYnJp5tVQNpfbqAbbZZCELz4UA?=
 =?us-ascii?Q?mnewYCdQqFj/J5EOwcxGVGdKWs7lqFhGuHpYZK5WOKJSr3R00jGsP7OlEZZB?=
 =?us-ascii?Q?pGYlFEp//Wjqc/6TiTNuH7GnDt9lTojcxCgs5mb7YEI1FkuYMzTriE8YW6sn?=
 =?us-ascii?Q?CKpt73+7ziXaq0wEdcF7+TjFC99qJMWPDWWOnFS2ZLSFd+7Tg3zJXSLh9DA+?=
 =?us-ascii?Q?11VAdguiaYgfoTP83Av4oTV1bPLLquo+5TEn4/JYDDUfxhgX17LMmLsf8V+i?=
 =?us-ascii?Q?Kly4CmMDvcF0ckMY3IromWlVbO2QzvypSKoO9owapjReJYlA1+we8iNAmoqt?=
 =?us-ascii?Q?o/H9wb9S76HIM1NQwor/Su/m7kAqyk7lBIufrsRuOQhDnzE8/TOph1DjR7n9?=
 =?us-ascii?Q?xJmYuEEkaIUqeJLIgg4vSGSgELP/FvXuINutuPrZKnZIlet7t5Hf2t+0/pjX?=
 =?us-ascii?Q?q9Z2/+PQrjtVU+VEV8UuC0mgaH6hBBaOB6PpdF04NIpC5Ngo4ag1zlzeSFcQ?=
 =?us-ascii?Q?qzuDxkDzuKNXFpW6A6rT15CbYyEh7P1P2AULjXyFCu6Gvi6RzSsa1FW7p+ln?=
 =?us-ascii?Q?r6hPtQ8xBhPwyqsUQ1wJKfl0mLB+DOy5E/Eq81adaDLaXoZQckA1UJeP72PC?=
 =?us-ascii?Q?Eve4JMdR52e9kpM6SXaF4yyexIfMxzFOS/4m1NPTRytxjW6A+F1S384hUQba?=
 =?us-ascii?Q?peo78Rdivk9+16FSdsL2nvstn8bjmyFxEmpcZvZlt9GhJ1a0YFfSm5fOzm0l?=
 =?us-ascii?Q?HVZj3kqtk2Nq9JKoYtU52DnbcGtzFDn7VzeMxKsC0xgObmwRPcBXSXvViGkS?=
 =?us-ascii?Q?g5Ac5q92kJKFFk6BsH8Cua2Vn9/6ULkAzVqhGIXnGUc+fNy1VyOxJVDyQm3u?=
 =?us-ascii?Q?SKz5A6MAgBWaiJdG7eGKn2roftWsvCL1ANmHFTG//GYdgOvmGcZAZ4ZnI1HH?=
 =?us-ascii?Q?GtmttLwunQp27qpNkQL/aeYZw2oy2R78/T2fSxcFST87Jg/j8UVJQrni29oh?=
 =?us-ascii?Q?385WyEQqq1h2yTXcc48bXLBLeBZO2AE9SFeV0fX5LOWWQn8kIB1mqnGyOai9?=
 =?us-ascii?Q?JaIQTA9XOfxrd/gzq66zq6mrtqAprcckdkZEqOTt21Fv0Dlvv+4nx4MT5Pus?=
 =?us-ascii?Q?npoOg854+HCGFBoMBjs8NtOfCikqjxFS+UtUVgiWFstmmhBp5wCdPLXKfw7w?=
 =?us-ascii?Q?4w1kZhpmEJag6kdvqV+oEV0zh1PQIVPoIN6FKfYFlDKfh0cRASaMxJTx8DFn?=
 =?us-ascii?Q?U/BrgHpnrYmMceM4/sVSejzA0BEzK1BKe7OrZMxR/MTz+JkqAS8kKb4dFGVC?=
 =?us-ascii?Q?vq7JYsDB7Mg4Hit7RUhMc2zj4tb9xyF833clWH8dv8TswlQu5li9kstlcz5O?=
 =?us-ascii?Q?08nXEXvKEu0hVwKLQMIFjK6uhjs1iJFZqdDvCfrI?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 01aa6d95-1799-412b-8f41-08dc2670ac40
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 17:34:14.9358
 (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: wifWBDBfQryWkLu+yVgqWHDe4hdQ7fAGdhzt8vrydTb6eq80YrkPTa6KgEQYHFwl6Ogevfj3ipi/4GcKC0JH/w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7733

Add drvdata::ltssm_off and drvdata::ltssm_mask to simple
imx6_pcie_ltssm_enable(disable)() logic.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v7 to v8
    - Add Manivannan Sadhasivam's review tag
    Change from v1 to v7
    - none

 drivers/pci/controller/dwc/pci-imx6.c | 37 ++++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index a1653b58051b7..8c816ff159115 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -76,6 +76,8 @@ struct imx6_pcie_drvdata {
 	const char *gpr;
 	const char * const *clk_names;
 	const u32 clks_cnt;
+	const u32 ltssm_off;
+	const u32 ltssm_mask;
 };
 
 struct imx6_pcie {
@@ -775,18 +777,11 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
 static void imx6_pcie_ltssm_enable(struct device *dev)
 {
 	struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);
+	const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata;
 
-	switch (imx6_pcie->drvdata->variant) {
-	case IMX6Q:
-	case IMX6SX:
-	case IMX6QP:
-		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
-				   IMX6Q_GPR12_PCIE_CTL_2,
-				   IMX6Q_GPR12_PCIE_CTL_2);
-		break;
-	default:
-		break;
-	}
+	if (drvdata->ltssm_mask)
+		regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off, drvdata->ltssm_mask,
+				   drvdata->ltssm_mask);
 
 	reset_control_deassert(imx6_pcie->apps_reset);
 }
@@ -794,17 +789,11 @@ static void imx6_pcie_ltssm_enable(struct device *dev)
 static void imx6_pcie_ltssm_disable(struct device *dev)
 {
 	struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);
+	const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata;
 
-	switch (imx6_pcie->drvdata->variant) {
-	case IMX6Q:
-	case IMX6SX:
-	case IMX6QP:
-		regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
-				   IMX6Q_GPR12_PCIE_CTL_2, 0);
-		break;
-	default:
-		break;
-	}
+	if (drvdata->ltssm_mask)
+		regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off,
+				   drvdata->ltssm_mask, 0);
 
 	reset_control_assert(imx6_pcie->apps_reset);
 }
@@ -1392,6 +1381,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = imx6q_clks,
 		.clks_cnt = ARRAY_SIZE(imx6q_clks),
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6SX] = {
 		.variant = IMX6SX,
@@ -1401,6 +1392,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = imx6sx_clks,
 		.clks_cnt = ARRAY_SIZE(imx6sx_clks),
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6QP] = {
 		.variant = IMX6QP,
@@ -1411,6 +1404,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = imx6q_clks,
 		.clks_cnt = ARRAY_SIZE(imx6q_clks),
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX7D] = {
 		.variant = IMX7D,
-- 
2.34.1