Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Frank Li <Frank.Li@nxp.com>
To:     imx@lists.linux.dev, Richard Zhu <hongxing.zhu@nxp.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
        Rob Herring <robh@kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        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>,
        linux-pci@vger.kernel.org (open list:PCI DRIVER FOR IMX6),
        linux-arm-kernel@lists.infradead.org (moderated list:PCI DRIVER FOR
        IMX6),
        devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED
        DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 5/9] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date:   Wed,  6 Dec 2023 10:58:59 -0500
Message-Id: <20231206155903.566194-6-Frank.Li@nxp.com>
In-Reply-To: <20231206155903.566194-1-Frank.Li@nxp.com>
References: <20231206155903.566194-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GqeT8WLElbOiIwjb1MnOUkWcG4C8jFBcGQYNAYKvuX3c8uXu1tmq9GokB/xS?=
 =?us-ascii?Q?An9n0hwS+AZ+PocolGAM0XJe/hVHw1uCUbJfIEJeHJRMExmB9Hydl35x+vD0?=
 =?us-ascii?Q?yYMaZJIG54G/Rmt6MCj/a+sEYujyHRcqqd4PbcgcJRnm/I6Tj1Sgy9o7Tylg?=
 =?us-ascii?Q?Lmw/pzeaA63qmiVHX7yNxp4DY6DSa22VixwpFP89AYjQsvsohgfgb3N5vgDf?=
 =?us-ascii?Q?GeZZV3qMzLG87UHWSMwqyBW10zjonwyzACaaK1d5d8bJxzfn2ZcXyN6meiis?=
 =?us-ascii?Q?wn3vRKhmuCCvpyeL/jj3qzSNNv711eZkCcm075+BntbeLW0H1VShi78fmVa8?=
 =?us-ascii?Q?S94ERYSelXoEd8IusUV7I/2p9mUX4omuIHkIGuSLtnqmHgS35BKZLOmEG6Lh?=
 =?us-ascii?Q?lSckni9HUxpMtYZ5+z2fewiSHbYGuMUWQmciNHM2ENN1gkH+nDYVB2bP5Rbt?=
 =?us-ascii?Q?yEW/nnc8Fl8yhrnMW9wqtIN6XXXrsDeLTEQzBipWado2I7pkxmvckrm0Hmb+?=
 =?us-ascii?Q?tm6wQsJfbFIk8YkBdciC1zUvs4+ZBr3HZQNTGbLtyi9wWPHgSZ8LAIn67zHG?=
 =?us-ascii?Q?4v7DDFav+B756EPT4dclttWJUhNapKyPe4pyf7Mxk17LIgEVQpfzJ4Sx8ika?=
 =?us-ascii?Q?p2nY4HYfY769Fh/i/1sFrAQeKMLTR5FKLkAlTjPK5yh0MtcBx6W1ZJb8k814?=
 =?us-ascii?Q?0fjd1k9a3itJ0aYi+Lv7o8WmLiXyZKiZY1XKyd2mXiJ/fWEpdrBLlkS+WAW2?=
 =?us-ascii?Q?2fXX8qz+CK2dLftHBGV1KnHF3ly20RV6jw0nh2GJhuuew4Fs7UTZgAK+ogOe?=
 =?us-ascii?Q?FBjOQ2quofzsCc68UM6JBCqf06EsTcrshQR1tc+jIR9KrZZwi8E7lyR2hXW4?=
 =?us-ascii?Q?6Uq81qBXECnHZ6UECqdOYehh0C9igvCwIIlT48AiWAAWdbyGdC0s9Iepg5BG?=
 =?us-ascii?Q?KK3P3syzSo+npyS59eQXO2xsQd5oiA3b9B0k66mwg0j2aeG7JcyHvJoIqvcB?=
 =?us-ascii?Q?nEadJ633YUKqcYVJnNMhkPSDNCkpYpjIhgB7wW+XtME8QSioXqgrA1VwZKyG?=
 =?us-ascii?Q?6H5VUuJ+OCGmvnBrLIt8l3hifcyjsIQB20vfKbgpg65OWn4KJCBpLbsg7Bfg?=
 =?us-ascii?Q?kbG8io6O9XFGll03wG6l7LXPnh2T97add1zAEscgavahyf2FNI8Xe7ZDe5Hf?=
 =?us-ascii?Q?TgbaPG0l56qoDv1dkvHqgkhPz2jWuS0c3o87qV1fOB2TplBBdpJ9Q/sj0Xck?=
 =?us-ascii?Q?k/apA901q74C/4J1XlAW+2tVfgZpW8PtolHJtl/o3xi7aQVbc2vzv1meHKg7?=
 =?us-ascii?Q?xQ+Aj2vxgZ0UmCl0vW15xVL3RK56Rmij9TEkqKzM8Als5MFCSMzhUQlPnUIp?=
 =?us-ascii?Q?PAFM8XYKERnk8BNU+3iKvIUOTAHsySaFnKb1omCMZxVScg7L/wEiZ2yKRXIS?=
 =?us-ascii?Q?YwTrXha/UVwOPhgbxzs+WGcQPbStBoWJbgvPmZVHfM7TYEN+EQcFu0xf1KDS?=
 =?us-ascii?Q?VhWhx7S78DgDM5u41MLilv2/zpgzb2JxEu+9lyhEe4gxC3VJDg5Wx4AqskYz?=
 =?us-ascii?Q?hiL3TEBMcyuEywUWcLU=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 63313520-f9f3-4fa1-5872-08dbf6745f26
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 15:59:47.7685
 (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: pL1d+c79vm7OIjg9LDLbpAaKlQD4QGHCqy3FM9Ey5MPccsULE1Jz3PjvwwK0Yil4qcI0xZZn/nCj/y4TyY13ew==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8123
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 06 Dec 2023 08:00:04 -0800 (PST)

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

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 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 239ef439ba70..334e714a7e96 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -75,6 +75,8 @@ struct imx6_pcie_drvdata {
 	u32 flags;
 	int dbi_length;
 	const char *gpr;
+	const u32 ltssm_off;
+	const u32 ltssm_mask;
 };
 
 struct imx6_pcie {
@@ -815,18 +817,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);
 
 	if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_APP_RESET))
 		reset_control_deassert(imx6_pcie->apps_reset);
@@ -835,17 +830,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);
 
 	if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_APP_RESET))
 		reset_control_assert(imx6_pcie->apps_reset);
@@ -1451,6 +1440,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 			 IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,
 		.dbi_length = 0x200,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6SX] = {
 		.variant = IMX6SX,
@@ -1459,6 +1450,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 			 IMX6_PCIE_FLAG_SUPPORTS_SUSPEND |
 			 IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6QP] = {
 		.variant = IMX6QP,
@@ -1467,6 +1460,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 			 IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
 		.dbi_length = 0x200,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX7D] = {
 		.variant = IMX7D,
-- 
2.34.1