Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
From:   Frank Li <Frank.Li@nxp.com>
To:     frank.li@nxp.com
Cc:     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, 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, lpieralisi@kernel.org,
        manivannan.sadhasivam@linaro.org, robh@kernel.org,
        s.hauer@pengutronix.de, shawnguo@kernel.org
Subject: [PATCH v3 05/13] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date:   Mon, 11 Dec 2023 16:58:34 -0500
Message-Id: <20231211215842.134823-6-Frank.Li@nxp.com>
In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com>
References: <20231211215842.134823-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?FDQ8oQQq2OnH1JBEcSp7jMFp1eXIpayvIoSKloo+faYzI+j/NQmVqRbhpYga?=
 =?us-ascii?Q?KIZZMlI0RW7xdNumHPxlu5JfK5+KYxHzJ+wCQoVU8xuczhgh5uIuLNFcI6M4?=
 =?us-ascii?Q?0SUlZFIx9OI68xd3VTLy4TvHoXY076ufh0RpeM1CoqNIn3nHjUgIbMEbYfiI?=
 =?us-ascii?Q?N18AOPE7B9DTunH5C7BhuwhB0wVmnAqtxjN15m2Chr80YAyoSaW1rJfp+bjt?=
 =?us-ascii?Q?Ks9e/r1eMb1s0X6SHqhAk7ZJLZAD3Adl7ZUSoWn8/Va821cRODg+I9TPYbjo?=
 =?us-ascii?Q?r+Mhgt9WWgFEp8Z69G8Ujs75maOXbUTiZBRrxs6Sls7kpuvbCgDIoyi6p+6R?=
 =?us-ascii?Q?YEv4H151ZW8qujM/VbbBSVL4nGlF1HEnj/BSwj/8eGcgKwmLGXe7mVGGsPW7?=
 =?us-ascii?Q?iZIB7U14bKGMirX/jSvy+P69C2LkFnDvO28n68EYWYls4kGtJ4PnjwDQwzIQ?=
 =?us-ascii?Q?TdHwCx0stQStavXJXCDE5DHi/N61LP83LAku3m6WB/tCR1txsBuDj9metbns?=
 =?us-ascii?Q?hvQKqe0iWksO6rjYhpk+voRXGXjAblhh8qnDRvyRyIAfBkN2xJTH17gSC+Nc?=
 =?us-ascii?Q?vyN5SirBAv/tu6F4h3/wj4HF3aOt4fWKdW/nX7eNpOmMDSbyrCsiTw51BncK?=
 =?us-ascii?Q?XWjuZiix4W8QuDC8bd+z7jfydKAttMftDMzWLqamn6hCbuBSU8W6WepHVXIU?=
 =?us-ascii?Q?jsIg6G/dl4C0PEVoWufE04jYtc+MQ/buaNrxJ2dfqzb2cPw/sQjeQ2Glli+W?=
 =?us-ascii?Q?7Qt18yTPIz//bZec0hcQw6TZTfnNYqDKsrh8BDi9/oDyF1swk9tfpiaN95vI?=
 =?us-ascii?Q?QJslutp0xip8iZKmFUgS+66fyZ4KzgTsOFL56eVdWWNKib0D2eH+hRr6FjIq?=
 =?us-ascii?Q?Yj1/6hhEMT+XsW8ujSXNy+o+i4ABViQNm6jXoSr76chPYWz1+mbCGf42bTcN?=
 =?us-ascii?Q?GYE4RRdKhWqaX79wUl9IoJPrk2CTxE4dYQdSm1IjBvRoWDETlkWLuxUxoL4o?=
 =?us-ascii?Q?zOZmWk2E3PSTFllAYRzxo4ifDegQZa7ihy4y+6wi65ocPseqUkDpzM4obyBv?=
 =?us-ascii?Q?cvp2/YcHCCp6qV/Q9ohGmmkRjryI2a1X/27myIjK+vuN0iSPxo0K/hYpVagw?=
 =?us-ascii?Q?ptnZOcf8sJEQJ0/bL+sjLrBGHvVqEsow6Bkhq1lnCnEugS30DXdx5TlIkh+U?=
 =?us-ascii?Q?nmtL59aVAXxbk3OwYq78BArXRuBnfacjJpkm+TZYOzvYYgLWnVsP25RHp8PG?=
 =?us-ascii?Q?ZKiypUMqaIUdif/zJ7yjr/sdA/FqmEZJIhhtdi5N7IRFkr8eO+10OklrHbDB?=
 =?us-ascii?Q?JeIhhmswUqf3Lbg5tusWKL/bycgtHbSjljVtbvrris1uCPp/u2I0TgpV2rub?=
 =?us-ascii?Q?fHrBpjKs3xeshVYyf0PZV86Ruxkv29xuYzoL6rIAn/7/976Nal4p1xPMa7Tv?=
 =?us-ascii?Q?TmhQAyYuqOdTDp3QJ6LW9mXe9sDhnpVA/7DT7boQGjOsBKnJGXhfFAhc7KzD?=
 =?us-ascii?Q?ROj4Rbj1mFW+Ruuo1zIPe5sRrFpwVjjAS1dQvMMR066jTuVwyk+GcGqeK+ZP?=
 =?us-ascii?Q?n85rFPb4KTqQ1BMUrtnmRm/IEs/OtmOsNdXt38nZ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eb3afe69-0f7f-499a-35d8-08dbfa947d60
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:47.0603
 (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: sk0aondQGLKEyRQcCkvMB1U0BAUDC1JKBjYVS73qjgR+PHUb4tfFw4nl8hQSw13fBpu1qK0abcJkEIuWohGtAA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
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 (agentk.vger.email [0.0.0.0]); Mon, 11 Dec 2023 14:00:13 -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>
---

Notes:
    Change from v1 to v3
    - 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 548034151ee1a..5bfb780e441fd 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 {
@@ -811,18 +813,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);
 }
@@ -830,17 +825,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);
 }
@@ -1446,6 +1435,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,
@@ -1454,6 +1445,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,
@@ -1462,6 +1455,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