Received-SPF: pass (google.com: domain of linux-kernel+bounces-20181-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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 v8 07/16] PCI: imx6: Simplify configure_type() by using mode_off and mode_mask
Date: Mon,  8 Jan 2024 18:21:36 -0500
Message-Id: <20240108232145.2116455-8-Frank.Li@nxp.com>
In-Reply-To: <20240108232145.2116455-1-Frank.Li@nxp.com>
References: <20240108232145.2116455-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?8nYHrigekY3a+MQJspEYvNB4vq3QtomL1WvmGKoKkpizRGYTFmye+9CPgLbR?=
 =?us-ascii?Q?Bp3ikeBgcHKJjr2+XpJWNgY5HHwGkhE23HNqZHJAMLZ91su07pqQUPvG0oBQ?=
 =?us-ascii?Q?1TZNImiQKLZWHO/7vdCbjKeTt4fYPIxLF7T3uYuJCLMZJZJB1+Yn1n68K0tH?=
 =?us-ascii?Q?aSbwRFG5qspFVgSL1i305OE41xl2upurwCt7B3KocQP1NM0JHBe18vRB9fr3?=
 =?us-ascii?Q?Bos64IVs7+P3YJArSQXBP1Th3JgK26zeFpjOTwxDXoeb4KvRydujxfC3wIhn?=
 =?us-ascii?Q?rbreYnQSEYdirMR+9+Z2EsR017yPlleOfIqkUoD3xzLqtZ+txdsOhalWZVdI?=
 =?us-ascii?Q?z8d+zzOZZX4ciVLJ88dxaCOTwSPlDB9ZuCjRrCTR+yUgQiZmIUZNjDzU3yzQ?=
 =?us-ascii?Q?eGXburOpaK6abP6eqWZ1MJcXQjUo5gJI57bFtYov+ONWzYt85gvTJml7AHU5?=
 =?us-ascii?Q?vLqPA0ezHr+YraBLYQXFouPGbrn9XC8ZwT/MG+Sgw7d5v1vvNwDK9efobBiE?=
 =?us-ascii?Q?xG5dKrKlbanYJMlIn3nVlg2g991R8w01iZAlAiTt8NZmm5EpiEOl2j4TnRS7?=
 =?us-ascii?Q?1VuAsy19L+aqfZQoRUxROVq+rybfoTQzSW1Z9RZmzVgC/LfoLMg2QflMwghb?=
 =?us-ascii?Q?O3N2AWdnyMfL4NwujJ+aZHaVbtHqN4lEhb3+0k0Gc+ZRLiAJja+lM43XBxd0?=
 =?us-ascii?Q?LIPSbvHMJBac958u9EHJJPkvSNr/PT1q+oKS1OKdv/bMGZc8p9vIUy7V0sUu?=
 =?us-ascii?Q?mBg1uowvEPI3bOWs3E77wCTiwefk/Kf0h/IqL69JrWW5Zj85UuBCPkPU9qX4?=
 =?us-ascii?Q?gKNylsiLbmHIsLw0KRXzlHqON3r4IF7jSWheN4KLp6E19Wi6RpSSAd8bKSX/?=
 =?us-ascii?Q?T9Xfv8TOrkE+aEKsjBVR680CzOHACcu2VyDXF+YuR3lnwvlT+GKMvpAdCFjx?=
 =?us-ascii?Q?P1H3G2HK2zFLy4MVttkU2Cs24H/lwSN02Yizzm4fim3gxrLSjR1d7xzKCUil?=
 =?us-ascii?Q?vCGvVL5aghKJi5VSdWKdHIUGFQz+6Yb2edhCNRddGZXL+uWpy9V6lHkGxQhs?=
 =?us-ascii?Q?NovAG8z3oXUQC2rwE7i0pnumD/lhIy1HLCxJl7zgI1HIha/hyWTPiU+eEC1g?=
 =?us-ascii?Q?3mUHae2uaZ4yiQLxD5IWt47hBhdkAYbp7Np7ooVVhJHItojA/c8+PtL5+tdN?=
 =?us-ascii?Q?eWHzLqbD2JfM8fQzgIvUfhMgyQWEDwo4Jfb7ssEG5eUhmuS/rEYR9tot/mZR?=
 =?us-ascii?Q?PTTrrESvdE1jxE70AbHKTPZ0jh+x4IaK1FFSVp96IQTEgmPA5bSVu4hmvxdu?=
 =?us-ascii?Q?ERWFXnCHJRaJxB68YaL5rgzvZHes1e+EkIK+KFMMYAArpuNMUmRcnIMmoc+x?=
 =?us-ascii?Q?k0SXFBNZxXIcQzf3mcZi74M6wz3U+vGCIaokHBleKvDix9p7II/+aW/hqHK1?=
 =?us-ascii?Q?OCq+/5+SqGn3gusSebAiRARbPGX3tJ+NLxa50WjwVvRJ5veY/uxB6nrEPDlV?=
 =?us-ascii?Q?BrVJ5g9lOEHGknPVRvEUOqAXSTRz+g3iFvtxn3VJD/sybLAYWBXBIuQu1N61?=
 =?us-ascii?Q?y6X+iiGljnnrUm/Q2UL5r6HYl5KZyRWJ0ahqv69d?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6842a388-3675-40bc-592c-08dc10a0b799
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB7511.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 23:22:44.2309
 (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: QU2le6n28BgcbuR9hPUXdIghZjgU+WoX3C0NDx2ZYI7JRVaDpD2NUjy7QJHtrZYp2rM9kKqBt5Be9qQmHf1whQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9338

Add drvdata::mode_off and drvdata::mode_mask to simplify
imx6_pcie_configure_type() logic.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v7 to v8
    - replace simple with simplify
    - remove reduntant comments about FILED_PREP
    Change from v3 to v7
    - none
    Change from v2 to v3
    - none
    Change from v1 to v2
    - use ffs() to fixe build error.
    
    Change from v2 to v3
    - none
    Change from v1 to v2
    - use ffs() to fixe build error.

 drivers/pci/controller/dwc/pci-imx6.c | 59 ++++++++++++++++++---------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 818e73157e724..fd83af238fa60 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -68,6 +68,7 @@ enum imx6_pcie_variants {
 
 #define IMX6_PCIE_MAX_CLKS       6
 
+#define IMX6_PCIE_MAX_INSTANCES			2
 struct imx6_pcie_drvdata {
 	enum imx6_pcie_variants variant;
 	enum dw_pcie_device_mode mode;
@@ -78,6 +79,8 @@ struct imx6_pcie_drvdata {
 	const u32 clks_cnt;
 	const u32 ltssm_off;
 	const u32 ltssm_mask;
+	const u32 mode_off[IMX6_PCIE_MAX_INSTANCES];
+	const u32 mode_mask[IMX6_PCIE_MAX_INSTANCES];
 };
 
 struct imx6_pcie {
@@ -174,32 +177,24 @@ static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
 
 static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie)
 {
-	unsigned int mask, val, mode;
+	const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata;
+	unsigned int mask, val, mode, id;
 
-	if (imx6_pcie->drvdata->mode == DW_PCIE_EP_TYPE)
+	if (drvdata->mode == DW_PCIE_EP_TYPE)
 		mode = PCI_EXP_TYPE_ENDPOINT;
 	else
 		mode = PCI_EXP_TYPE_ROOT_PORT;
 
-	switch (imx6_pcie->drvdata->variant) {
-	case IMX8MQ:
-	case IMX8MQ_EP:
-		if (imx6_pcie->controller_id == 1) {
-			mask = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE;
-			val  = FIELD_PREP(IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
-					  mode);
-		} else {
-			mask = IMX6Q_GPR12_DEVICE_TYPE;
-			val  = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE, mode);
-		}
-		break;
-	default:
-		mask = IMX6Q_GPR12_DEVICE_TYPE;
-		val  = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE, mode);
-		break;
-	}
+	id = imx6_pcie->controller_id;
+
+	/* If mode_mask[id] is zero, means each controller have its individual gpr */
+	if (!drvdata->mode_mask[id])
+		id = 0;
+
+	mask = drvdata->mode_mask[id];
+	val = mode << (ffs(mask) - 1);
 
-	regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, mask, val);
+	regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->mode_off[id], mask, val);
 }
 
 static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, bool exp_val)
@@ -1389,6 +1384,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_phy),
 		.ltssm_off = IOMUXC_GPR12,
 		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX6SX] = {
 		.variant = IMX6SX,
@@ -1400,6 +1397,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.clks_cnt = ARRAY_SIZE(imx6_4clks_bus_pcie_phy_axi),
 		.ltssm_off = IOMUXC_GPR12,
 		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX6QP] = {
 		.variant = IMX6QP,
@@ -1412,6 +1411,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_phy),
 		.ltssm_off = IOMUXC_GPR12,
 		.ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX7D] = {
 		.variant = IMX7D,
@@ -1421,6 +1422,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx7d-iomuxc-gpr",
 		.clk_names = imx6_3clks_bus_pcie_phy,
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_phy),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX8MQ] = {
 		.variant = IMX8MQ,
@@ -1429,6 +1432,10 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mq-iomuxc-gpr",
 		.clk_names = imx6_4clks_bus_pcie_phy_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_4clks_bus_pcie_phy_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+		.mode_off[1] = IOMUXC_GPR12,
+		.mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
 	},
 	[IMX8MM] = {
 		.variant = IMX8MM,
@@ -1438,6 +1445,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = imx6_3clks_bus_pcie_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX8MP] = {
 		.variant = IMX8MP,
@@ -1447,6 +1456,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = imx6_3clks_bus_pcie_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX8MQ_EP] = {
 		.variant = IMX8MQ_EP,
@@ -1456,6 +1467,10 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mq-iomuxc-gpr",
 		.clk_names = imx6_4clks_bus_pcie_phy_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_4clks_bus_pcie_phy_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+		.mode_off[1] = IOMUXC_GPR12,
+		.mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE,
 	},
 	[IMX8MM_EP] = {
 		.variant = IMX8MM_EP,
@@ -1464,6 +1479,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mm-iomuxc-gpr",
 		.clk_names = imx6_3clks_bus_pcie_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 	[IMX8MP_EP] = {
 		.variant = IMX8MP_EP,
@@ -1472,6 +1489,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
 		.gpr = "fsl,imx8mp-iomuxc-gpr",
 		.clk_names = imx6_3clks_bus_pcie_aux,
 		.clks_cnt = ARRAY_SIZE(imx6_3clks_bus_pcie_aux),
+		.mode_off[0] = IOMUXC_GPR12,
+		.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
 	},
 };
 
-- 
2.34.1