Received-SPF: pass (google.com: domain of linux-kernel+bounces-2463-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 v4 04/15] PCI: imx6: Using "linux,pci-domain" as slot ID
Date: Sun, 17 Dec 2023 00:11:59 -0500
Message-Id: <20231217051210.754832-5-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?fLdr+2yO9FfW//1WNcFaTwArQLozhJd8e0MfMmxGefg/0pFGOHUwecxAFeg5?=
 =?us-ascii?Q?gohu68gcYj5/1HvUBTMBaKYGzAjRFsaJnbMZ/oDkm8t3F9LWGAszkG9JulYV?=
 =?us-ascii?Q?Mk55lhXEmGlfgNO65a+O/nz/h82Tk3Gyr5pAlwrw0LAsDuyos/gc8vjnsuH9?=
 =?us-ascii?Q?P1b2rP/mVQHWpAwS4dHPa+NhoXH6B/pyb3C3yADdly7bLJngQLPeS8xJkMWU?=
 =?us-ascii?Q?3OZFOUkNDOEpuWeusYp/Og50mUsYAEnToYopelB5Z4G5a+cYcYbbfS33i5gp?=
 =?us-ascii?Q?Q+wwRzXSNycoi0+n8w4guP0CtAQUQu4kC9B371MpU98fzDY2NmvxbdWmOn+B?=
 =?us-ascii?Q?bL20hqORsfvTvGLoWbQFSgqdc2Qc7nf//K7FnKCOHoS4vO4lQ5PdmNd3NStx?=
 =?us-ascii?Q?U4I9aTY6pGZdyImG/VRFi46VXCFLBOioMfLSsaRwixDWKZQNr2ZVsHNmnPJ7?=
 =?us-ascii?Q?s+ViSaLXl1Qqxs7qOeNossyOxrhMdzc52it3UsUubrT3l50jMKVfjCYHum1i?=
 =?us-ascii?Q?TC9j5s6vRAixAMgDBUfsmVBM14pr7m/P3Sp/i4G5IMhIDbDbE3oGbjHI6YL6?=
 =?us-ascii?Q?FAqYFGh2P8ieaQ7HX0kHJbNBrSwBCca060rvPAx9KdfPGibZ/RPyxLsqxoxP?=
 =?us-ascii?Q?OnUZXdWFtsh1/aKcdCZS5G44VXZV9GvlfBBA1eb2MyLBCNxTgmnt9fHtk3EJ?=
 =?us-ascii?Q?4isWzu70FrIU1+oqBhJq6bGx4geTqWlyQ04ewBctrGsrCd9w59RsQO+9kxnM?=
 =?us-ascii?Q?WDqdd9gEbW8jVllKV2bjExm7SAUEYc4iJFbL/egv3jd0x7T0JmrqO6/sO1zI?=
 =?us-ascii?Q?kOfVr5bDSDSaBjq+/DKlUoMAM+7knQAZPN2pu2qHK8YAmQmpRNLzNNxFi5ds?=
 =?us-ascii?Q?MRo/aJ6qijx10Yd1d4uMx3kWj3HWyisodLulCi5F8wxYkY07sOaM7/rui5UA?=
 =?us-ascii?Q?sxCBTMBZiI+wlTeGZf5Rqw/qNbMr2+1zodYj3H/7TSQreRyFEjY2zB9Lfo8G?=
 =?us-ascii?Q?Xc+rLVn8CpVQk+2WwXMgQnmWs7yyArngKjQl9nqc9MG+PCltmDNpuJB0eX1W?=
 =?us-ascii?Q?U9z7O7rs1oLU3jIUuM2X/WPh8DNhTttQKDcy1laUXHK1gNwpWoFqGIUJptK+?=
 =?us-ascii?Q?q47Q9n+9J1xP9HKLbG6KktRwfaXs9wZ30Dm2iIoAP8p+DTlUw9L5GbVhwlhb?=
 =?us-ascii?Q?uWYJS9WIUNzDTWTUFv909Z8mjGxQOZj+m5hkBSu/sRmmgZeMSAx8HlRHGBeJ?=
 =?us-ascii?Q?k1gPYpTVnQCXU9jxS7+JoTOyfjlR+hI5k0filJuaN9VeU60j6LS9ScU4nd5H?=
 =?us-ascii?Q?Kt7KiwwUjdlVmlsjOuNfpGgq1Wp55h9buXK11/swsHIEb6Mqb3G/4KAs0LXN?=
 =?us-ascii?Q?XSed3cVjthQDjQdwSoHX+/579EthPG6yskI6mURcSS2CSw3fyn5yPT50Zvr9?=
 =?us-ascii?Q?rPEntbzlImmZtEBJLQEIQvbJRRu9u1Jyvv9+xruxwQ2xJKC/13LdkD6XWhQa?=
 =?us-ascii?Q?9ze9OS6MkAr3PcUrpDRvoD9ijeydlMmL19CacbbkFIrStzPujMguuPUNg7Wd?=
 =?us-ascii?Q?/Y2+E0gQpEF1PZzgqMs=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 033c5254-2f27-4389-fcb5-08dbfebed3fb
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:12:55.9923
 (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: Mp1a4uON7Yop1B6p2R7rcZ/ejC69B2AFV+rw9vgmz5+DDH6O1MuuJYrMrgIlzQ4F6OlBccQKiRxruTjkup9RyQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8174

Avoid use get slot id by compared with register physical address. If there
are more than 2 slots, compared logic will become complex.

"linux,pci-domain" already exist at dts since first commit:
	commit (9e65987b9584d arm64: dts: imx8mp: Add iMX8MP PCIe support).

So it is safe to remove compare basic address code:
	...
	if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
		imx6_pcie->controller_id = 1;
	...

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

Notes:
    Change from v3 to v4
    - remove compare basic address logic
    Change from v2 to v3
    - none
    Change from v1 to v2
    - fix of_get_pci_domain_nr return value check logic

 drivers/pci/controller/dwc/pci-imx6.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c1fb38a2ebeb6..7145947e21d92 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -33,6 +33,7 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 
+#include "../../pci.h"
 #include "pcie-designware.h"
 
 #define IMX8MQ_GPR_PCIE_REF_USE_PAD		BIT(9)
@@ -40,7 +41,6 @@
 #define IMX8MQ_GPR_PCIE_CLK_REQ_OVERRIDE	BIT(11)
 #define IMX8MQ_GPR_PCIE_VREG_BYPASS		BIT(12)
 #define IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE	GENMASK(11, 8)
-#define IMX8MQ_PCIE2_BASE_ADDR			0x33c00000
 
 #define to_imx6_pcie(x)	dev_get_drvdata((x)->dev)
 
@@ -1279,13 +1279,11 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 					     "Failed to get PCIEPHY reset control\n");
 	}
 
-	switch (imx6_pcie->drvdata->variant) {
-	case IMX7D:
-		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
-			imx6_pcie->controller_id = 1;
-	default:
-		break;
-	}
+	/* Using linux,pci-domain as PCI slot id */
+	imx6_pcie->controller_id = of_get_pci_domain_nr(node);
+	/* If there are not "linux,pci-domain" in dts file, means only 1 controller */
+	if (imx6_pcie->controller_id < 0)
+		imx6_pcie->controller_id = 0;
 
 	/* Grab turnoff reset */
 	imx6_pcie->turnoff_reset = devm_reset_control_get_optional_exclusive(dev, "turnoff");
-- 
2.34.1