Received-SPF: pass (google.com: domain of linux-kernel+bounces-31401-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Frank Li <Frank.Li@nxp.com>
To: manivannan.sadhasivam@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,
	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,
	lpieralisi@kernel.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v9 06/16] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask
Date: Fri, 19 Jan 2024 12:11:12 -0500
Message-Id: <20240119171122.3057511-7-Frank.Li@nxp.com>
In-Reply-To: <20240119171122.3057511-1-Frank.Li@nxp.com>
References: <20240119171122.3057511-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?hKqC+9Bc+D2dvBbAym8XKcWc9FPwVaXiY6WUnYNPrp6kEvp6TVJk+S5RLEZp?=
 =?us-ascii?Q?TNpFfhmEHGUBWlpo79rBtWDy1hmoIXPWybBGuhmgw29pQlr0bnm4HfbFxcZd?=
 =?us-ascii?Q?dnNvtkDYMlCs3NQgnUvrl8MuFQAWRubeKXAOkY3m8YJXRIi2BenAZYmywV3V?=
 =?us-ascii?Q?4WU4evQU7PFOTkTbTSmbe65cN7a8yuSXukokir7v7j+q++e7f9Ck5ihBcy2C?=
 =?us-ascii?Q?W1jWUe3ibZehOqeOagZSaAsTnW2jGB2PpBaSJyK+momnPxUjVQR7oxZf7RMX?=
 =?us-ascii?Q?xFTNYgnrAlWrhUXA8oetsJQg1dV2nQzLczH8m65EdmZO4m83vTXOKHQys6Ko?=
 =?us-ascii?Q?RLGYQ6bi4oAqjh5pzUQlw9vWQ3tRIykBglhNczh6VeRWjxZLQMhlKBnJRZ7b?=
 =?us-ascii?Q?Lw0vHjovjFsJJQcPCaWXeqzKSB44MF1Qebs5yw9RMpRlQ2wjrRsGMl2GiDgs?=
 =?us-ascii?Q?IS9jRYgR4hEn6qfzsKQww1yGyC8lejlFUpi2OszfZa7FbT7Os0Gcm3oab1pp?=
 =?us-ascii?Q?bSlB7iDefPCGYdmFJW6XkovEtJ/Q+CScv3D5XCWfQpYOUqVoVVcvuwTfPZHH?=
 =?us-ascii?Q?GvN+BL/7b5mr+9KRZvlkbHz1YLGFIdO8T91RwhbB+Hty7/hghrUzXPzwcOjs?=
 =?us-ascii?Q?Y63ZXgUPpHllGDQa2u8O/WLbiwllnHqcHLqxfQ2Y+10Obz/oV0C1zgjN5vat?=
 =?us-ascii?Q?R6Ews9S3Gjfsb8JQcBbgG20Yy/tFc31ePoTfoOfzYiRCyyrtFMG0v1UexwaR?=
 =?us-ascii?Q?KrzwYaBPLCFmQRfsMaapFccrhkWMq+wJo8QONXdH2ut9/aPcgcOBiSJqFVJE?=
 =?us-ascii?Q?ZNnhEtkVgLMjPcoImPxcXtwtgtWU7v32RHYhtSTPQMzqmkhrQdZ7A1dFRbxd?=
 =?us-ascii?Q?jRFvb+kiSfGbWLHoEf4e99b2uhlPTIvgIfRr/BhPSW4yCNajaXdeDXwpzMyS?=
 =?us-ascii?Q?Y5ozr0Gbqwp1zCwU2tKKQFnJHijTeD9tqHHRnpxfs1CLMorBZBWx6oWCaZN2?=
 =?us-ascii?Q?NSqUqKXcRM0+N3zVFFbHjOAZF1c5xv0S2TQrfoaBB9XIgcMh41faiAiDoNvM?=
 =?us-ascii?Q?S8xVXOe4b/K8Yk/m9TVAyKmBQ0wELcaoTSPfvykbTeQ27XjGvf+IVGxzge1g?=
 =?us-ascii?Q?J37W0xvjbAUtmLCbgu+9FhiRPepf7+iAi7W3JiErZPSMm3aElbeZFqSyJSue?=
 =?us-ascii?Q?hkj9SdyQhqPpDxt7hpgDzXZ/Z6LUotqvdJolc3/UtvcwTSUnuwaCrwttWLyY?=
 =?us-ascii?Q?b9Epdf/MMiZrB2gacjo1ZaRPCx1p1pCU5SHkjxoYAsRY28mDP+/kAcF4WNy9?=
 =?us-ascii?Q?mZySfZ6/otavx3jGvlmnIZchrvdsKJInrYTy5wuW0+SWhP6RUlCC3EI2jvQN?=
 =?us-ascii?Q?iLN7TdiNGg0EPYl03D4jIUi89D3llGVjPY2+b+fNs6ZdQyDQykaasO/nXkj4?=
 =?us-ascii?Q?7wn64VuOLazYWo9hEVLhdykuRPrXUActG3pg1ZGtSsW9724iQhWkQ94+RXJF?=
 =?us-ascii?Q?psrVHWlOTqfPU5j8ZuSnjyyMsf+FDJTmNAzzg7KMQh3hTBLFr1EhQFndlY34?=
 =?us-ascii?Q?SaNwajKcbiz+lazIf78=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c61c5fb4-d65a-4d08-c0d6-08dc1911c7f2
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 17:12:14.1225
 (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: QcSeyhrAt5B56xPfgbQ0wZVmJB9+HiI53bNcBurNpe+4HAeN3ytq12Jle8S+m3LDYdrIEOlbCwXNUnptoCbjbg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9688

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 773411d20329f..d19fcb54fde0d 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);
 }
@@ -1394,6 +1383,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,
@@ -1403,6 +1394,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,
@@ -1413,6 +1406,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