Received-SPF: pass (google.com: domain of linux-kernel+bounces-73329-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>
To: lpieralisi@kernel.org
Cc: Frank.li@nxp.com,
	bhelgaas@google.com,
	cassel@kernel.org,
	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 v11 04/14] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date: Tue, 20 Feb 2024 11:19:14 -0500
Message-Id: <20240220161924.3871774-5-Frank.Li@nxp.com>
In-Reply-To: <20240220161924.3871774-1-Frank.Li@nxp.com>
References: <20240220161924.3871774-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?1gyF4f5PeiOuKTd96JY7xwefE2ckqBWGMgRbC6omZq03KohQ12vBETLj47AB?=
 =?us-ascii?Q?4f0o6nWEckPe6kBrInq+g6ozQxBTqpoIx3IbDn3c5Pwj63ai0Uld1dWqMX5P?=
 =?us-ascii?Q?zBrNm9/uh3nCenYCTeKcILNXLFT75lJOF78uFb1ITPF8UM6flQR+BTwdEmob?=
 =?us-ascii?Q?IlvX+go3WEuFf9ATiyr+CT1VQ1GQFe4ok690+UjGwKbH897VnIKwwN4YGgPJ?=
 =?us-ascii?Q?5Ay0hFO86JbiFZEGv/lIh3Ch5HHr/spVpg7OgzsHyz5T6OyafW7a0szQMVZt?=
 =?us-ascii?Q?khjjSFP6tLWDjvbwH7Zz4Awv1TbPaig1BjWxgNMW/pbKEPQle+YGwEGe6IxD?=
 =?us-ascii?Q?0mkjOZTO9RU11yhB6J9F9pyWttg3tyWzYf5WkVyMhfuS4E7owQCMRzaWLV3Q?=
 =?us-ascii?Q?duFAHfAzrk3prR4UIrMCOUrs5a2KN8524EOZfBWWcs22NAOQF8ej3lLMLvhM?=
 =?us-ascii?Q?Q8QDpaLzZ2EtbALqnoqFQMLY2jjsVzoCRjWOf69XstLIQelqXsZjhNZ9m23M?=
 =?us-ascii?Q?GJh+Itr9qSA10yO0SjtiO/T0cmp9+4Z7bxg+KCO2Hx28RuFi1zbOjwJhQzuO?=
 =?us-ascii?Q?beu/wwJPxgB592WjaJ4X6rob/ND9Z31mEd0zmqNwjcvzzqCi6T0HdyqbH+ET?=
 =?us-ascii?Q?0OMqdVo5apwkPjloxccR2Mze7Jsm1Avln6ljCFHA4IddUeFKpgTS9EM/IAl5?=
 =?us-ascii?Q?rQfmRzutdzu33kmRy+ww1fg9My3geVdYuOKklC5tApQo0F7zNbjvIaopn2do?=
 =?us-ascii?Q?8FQ9Ol+u6FhubtCRx75U1iGKNxNJRMX1I1d86TJDrhyqvEXrjo9BuQsBLRMd?=
 =?us-ascii?Q?9729VjpRbPLiQ9MEp4WXG7764uctA52b+ssZ0p6FffaWYECrA1YEAECgURbW?=
 =?us-ascii?Q?G/5IECYkmbzmVxEeFH2lv58+DSuSTjS/5DQ6x9RiYo0JQAEjckD4tJrn4YKR?=
 =?us-ascii?Q?lIWg0rLYopVoz3gyYtukAqUo6fF4yVynRP3NITeJldX08CT/zFoMt3tnJk54?=
 =?us-ascii?Q?+tKyvZwY4Vyog0ubd8VQuJSyTiEM/zbICj9p6v3I849i49D4dCntHQH1Q55E?=
 =?us-ascii?Q?JRtYfk866uAnT6MtD8/UWJf9qV6OZYrEut00wH0siwv64nZufCK3b4y0I4c7?=
 =?us-ascii?Q?H5jWZ5Wpw0bNHSc/N64f+PcOmlsj+/1uQN+aHYD+JuBffyQoPVgqtHbVCwtM?=
 =?us-ascii?Q?2aSjKyKqSno34QiVmUWGlJ2TeX0Uvmvt3IVovg0mj2J7yxWt6OYwCifa4eLJ?=
 =?us-ascii?Q?H7JMP0T+G/YzaUgg0XIHcMHtcZJhztuBJwsgXNh/H2YZtL/zYTJpx+Da8hwX?=
 =?us-ascii?Q?nkc72DaBs+pylFshhXEynDoniyHLqQgVE3KI4MzpiPGE0acjgz8IhKtnSbRL?=
 =?us-ascii?Q?a8ZgwRFi+OJ9V7V1wbF40aAHAPZQh+9KGKODT5QeGjR/owT/WO6WWoWuiJ/b?=
 =?us-ascii?Q?KNaiM2CFdQPTYuzJ1tftBXS2nk5ENaa23SUOu1LCsiYlSQD/oItXBfxR5sha?=
 =?us-ascii?Q?QM5OezYOFUVc+Ynjut/dRwVhdvYGuvb1JazumYXMDoDnjiG+gAZ1s8hHP2jR?=
 =?us-ascii?Q?vdpJihAeBpRbI8Ls0KJESvbEtyrSGy6I1xOeYrvA?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 534b0445-0edd-4f16-4e2a-08dc322fcc28
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 16:20:05.0788
 (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: XaF6EhEgqFv5LlCZhpLqLVZ9caFaERkXoWCKM50coRV68US1FFX5mRhrOwxGv0ozG1IKI2k5+NOcQpHkBPDm0w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8682

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 072601591fb4e..982aa982efd66 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);
 }
@@ -1393,6 +1382,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,
@@ -1402,6 +1393,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,
@@ -1412,6 +1405,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