Received-SPF: pass (google.com: domain of linux-kernel+bounces-2464-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@nxp.com>
To: krzysztof.kozlowski@linaro.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,
	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 v4 05/15] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date: Sun, 17 Dec 2023 00:12:00 -0500
Message-Id: <20231217051210.754832-6-Frank.Li@nxp.com>
In-Reply-To: <20231217051210.754832-1-Frank.Li@nxp.com>
References: <20231217051210.754832-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?ISI61kaIXUiBdve1vPOh9g47lHUb3BKjyeq/VeJ19Ioiv+CGWbYkcoQtgDom?=
 =?us-ascii?Q?c7JA5NSlPMCRBy6kXZ/PCTld578NlPTl+4BRkxNNOKvYJQzM4ldyjj5NIRGO?=
 =?us-ascii?Q?UyMcBAKXsN+UE7UwYMy5zyL5wEE93iHVEnnW74ccnRM1+U+a4cK0IBYQccHS?=
 =?us-ascii?Q?MrnLhPxKcFv9fFWIzz+SMVn7YXT8wpopXa/sZ6h8aC7vsjde9gECRjU7uGm2?=
 =?us-ascii?Q?kF4apJCHPlsgs12Ys9vNO2iw+HnLPzoUlq9sRPNVoUUIXRNiTg6AgEevzVq6?=
 =?us-ascii?Q?3mRExhjxERt3LELfK/yFHNaoyc5dAKobQ3yKYYCimga1CltiUj7wF6qMyGcF?=
 =?us-ascii?Q?59bXqL9kL9NAXwqya7shI10RM5jw6putYxIPX4c5HVZ6rgwMSuhALNsSzTq5?=
 =?us-ascii?Q?reOPie3O9Nx+Pb0LbxAqkh0/pZd9DrVZtp6gOXMx9SidK/BWI6PR5UcYDyEJ?=
 =?us-ascii?Q?IOL+MVfBhv316cnHWVTsfhamyF6CyBogzwIg2Xl+Uay4rkKtvIY3F3PXRoWD?=
 =?us-ascii?Q?NK5y+zIN0PsjcAiBuE0JyFLNxK8rbpZYIA7EyAWzE90qoeMLSqTGhRRPPQHa?=
 =?us-ascii?Q?EZ+h05yHy1vEXc4+56oc4xfecZD58cuy2jlmL2GQro4yZTRDZTIpzKyFatmc?=
 =?us-ascii?Q?A3EiaXAcEqirI1/H8iDb4JFmrBVhcBm+zu/ilZ64RBe15iNP16vqA95GaMUl?=
 =?us-ascii?Q?tRimqqCzT8xKwmfy/BBcWP5y/SqzkJHgpYSeXzCuspmHg0TQkVccvcL/bLy8?=
 =?us-ascii?Q?GSC8y7Gz+M58p8BKW2fTa650cqv3FiUOj54Cf7I72yJo6qkQSHPcBPqHsLUt?=
 =?us-ascii?Q?OFkJWtdhVr9j5TOFTZffheF6koXjPh4x2v/WIIgLDtcNPAabUlfnwEq/0jAa?=
 =?us-ascii?Q?iWqrZidHX3cUCNMVhAMuTw5YDR6GQR4KT4V99Rg13mYG4o9inWLxC347aGAA?=
 =?us-ascii?Q?36w8pZ0jZ3qPqvrXeSz5Vz/3Q+sjwavH0iCVkYva+23oAqkzrCVxvi0A7RP6?=
 =?us-ascii?Q?s9x5fDm3s3MsZf/vyD5Ygh438FXZtG76qO43mAy4glb7FEPB2jXzlOnW6joE?=
 =?us-ascii?Q?SEQOzKuLLIyBxcMumo1200ZfVGkOiNzIof0+K3pzi7kKT8EYIevVpeMMsZTQ?=
 =?us-ascii?Q?3YT7Uiz6sE3AefTLRiI3puERWT1gGJvBAfnn82/X4S4Z1pKzNOoHW8KH+X4m?=
 =?us-ascii?Q?0aZVU5DOyDf/r+ohdR/c0HO57NbcSrtE9a3rl3EUaCClebVe8I+jG5ztXDsY?=
 =?us-ascii?Q?JtW+r8ZmcaRXd6VmzZeYhQ0S0ZNcBrHPtZypCjprLW+dxNGYLkJa2lhzl9Nm?=
 =?us-ascii?Q?ZYuec896/EUjHuSDS/p9Y0CQrFIk15kF7dSh3x2k4Oll+nSDGPh1Wc7nPlMk?=
 =?us-ascii?Q?JCnq2Y43WwrQ/vonpnSsE9z0+BfQgTvNIXfZOyDQ6xEg40eIl96tQJ/pv14d?=
 =?us-ascii?Q?G6dwyzOtf6ZxHGP8ckez9cw0acr+QiTKn+M+biGOo5R645N1iGmw3+F6MfMh?=
 =?us-ascii?Q?HgUGupe4RqfmQC23xMcSfqQrOiT6upRx+TFg/wlxha6Ft/8gjIgynQiHaKnf?=
 =?us-ascii?Q?rNdwLNEKO+V0kt8tSN4=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd9dc01f-d1b1-4ea6-c3cf-08dbfebed70e
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2023 05:13:00.9907
 (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: fWR5JdLsV9uk/vegjqUzcdyyC4Rm7QPYOoM3UN4RYOwlBGIcJzres/jY2lht3Im1gxZHU/IZhQF3FGJhh3ddqQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8174

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 7145947e21d92..79d892836a24d 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 {
 	int dbi_length;
 	const char *gpr;
 	const char *clk_names[IMX6_PCIE_MAX_CLKS];
+	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);
 }
@@ -1385,6 +1374,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.dbi_length = 0x200,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_NO_PHYDRV},
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6SX] = {
 		.variant = IMX6SX,
@@ -1393,6 +1384,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 			 IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_NO_PHYDRV, "pcie_inbound_axi"},
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX6QP] = {
 		.variant = IMX6QP,
@@ -1402,6 +1395,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.dbi_length = 0x200,
 		.gpr = "fsl,imx6q-iomuxc-gpr",
 		.clk_names = {IMX6_CLKS_NO_PHYDRV},
+		.ltssm_off = IOMUXC_GPR12,
+		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
 	},
 	[IMX7D] = {
 		.variant = IMX7D,
-- 
2.34.1