Received-SPF: pass (google.com: domain of linux-kernel+bounces-20179-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 05/16] PCI: imx6: Using "linux,pci-domain" as slot ID
Date: Mon,  8 Jan 2024 18:21:34 -0500
Message-Id: <20240108232145.2116455-6-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?BUojhYJcEerQVa8+33rFqdYWyqX4PUzRQBCIBltQwGBnSqfje/STw7qsrD38?=
 =?us-ascii?Q?BHiF8SbmUcvQaZDAc6gw0rOqgDg00EJvxZg/aVwqs7Ojg2c3/EZzzkAhP7dd?=
 =?us-ascii?Q?HRw1mUNf+qipVL+4FzGcrV4x6tCvzGhr5Tx0NeEJCR1vba5sIT532f5lkBEx?=
 =?us-ascii?Q?VHTAdzQpamrHiwDsWxL2PBgq921Gz3F3BoI7CBbnDAJZ8mg36Xn8rAN6qbIQ?=
 =?us-ascii?Q?sK28IFO+HwbCaLt6G4g+odICJhmLHj9r6zgaBnkjjbdfS0ca+v74DMUKfVHN?=
 =?us-ascii?Q?LlhCuB0OoaVST6bvVVxm37t1kHTm0oaY/iin84TypNfpfHurOpM1CE4zl4l3?=
 =?us-ascii?Q?tm4TmedHmqs9nYG6TJ7mHtWARJCYPtHSL2GEefQMc/h7WbOtIpfRbyGsH2W3?=
 =?us-ascii?Q?yDxzkJ/ZJWY0U1v7dHKBUz+J1WU1JAbpqcHMFhNDkJsu1AAQzxcEG1ZzWKBE?=
 =?us-ascii?Q?mm8szBWG725No2pvN9ZwshEtsi+6/s1c1gxs9ho1KF3xo0Sfp8VhBFdAxN3t?=
 =?us-ascii?Q?tkU8wWnwbok/9QQutKwDumHWyE6xipXxwpBJZ20OevE6qlZ65wMeyjqzitYi?=
 =?us-ascii?Q?qrigC2Ao/1k8yMMc1anOJMeRSmmO1MXcGOmoDRR5OiVFKlDD0pSziIxqJLc9?=
 =?us-ascii?Q?gSXWPdBFfH7SLe+6NfmkC1WURZlK+khr+e84FcIdcvi04xQG4N7Kk7nCoTlV?=
 =?us-ascii?Q?vqax4Cdwbhno3EQFTRSCZrcWKNVNKdCrXx3g4lHY8ZSfY3DFCNJEFYxi1l0N?=
 =?us-ascii?Q?nKcoW+aQSGdYZrhyV91ylnBZpODw0Ko4X7PHXUAK+571wr1inmsTt+Tlea9W?=
 =?us-ascii?Q?MC+maEgAMWfqS3jIoiaYPeo5RshpmxEZXMwKezav/lbID3CsYCmo40vjMHjC?=
 =?us-ascii?Q?mg4GDk1liqz2kRAtGZuBYZ9N9B6IFXuj79BOaCfWjoNdPVP/tebRtNPWNpn8?=
 =?us-ascii?Q?UiKyN4y/fmaYSzG8uQihTOFcbYTmL8gIP1P7qkoPNyD2o5qSoeZ1fatzgYlp?=
 =?us-ascii?Q?ukZATq77fRwulxuKT3v49LyM4Gd+1S+jAVxp5xvM6te3QYETwKUe9/D4SzMk?=
 =?us-ascii?Q?3r+7JoF1EzuIdVIEuU5daUzp27JohchQbW+5hZ4PbR83RXb7CSNF9vLPs6Ll?=
 =?us-ascii?Q?He3QNm7buHP9SLjhed1GQIGPqqYG96xPDnho94uul8NrQELib47OFnJlozQk?=
 =?us-ascii?Q?Zy6p/tbvG2shDTNCZuzoknBnqZPiiUyjJy9kS7rd4QYTxVQBCyA0RYzM/fHX?=
 =?us-ascii?Q?rlcTQRdC9sgIR6M3baN1QxdYiGSU2ZsZjr1cqzCUp4lfib+2Ii4448CDxZN7?=
 =?us-ascii?Q?A3O2uKblqiUOl3RTulIBP8cho4NDwUsX+lvtE1Deuia13kidlokenbkpADWr?=
 =?us-ascii?Q?RjQutGE83UR4DPfmdLlvAj/I6/ixpwG+i2P6etPIALT5+Q/ktO/gq7Ewba7f?=
 =?us-ascii?Q?SrO18ZiGkG3z45kAwUZACEJv6Uh7wXySq4TP08wOFL+t3lG1AVBcIXygF7XC?=
 =?us-ascii?Q?pCbDcl9LbBAVVt2lz9JimCEoXTlcSS44ywB4yuzFP8NGEf6kbdpOM//mo7OA?=
 =?us-ascii?Q?e3AL5JMAfi9ZAf4TIBdaz35zjWtF7Sk8ZaXgDdbw?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 35b09406-13fd-4026-4b34-08dc10a0b15e
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:33.7876
 (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: TMHlIm+xeD8zuEaLmGGWpiFW1VSBdEJxx+/BJKJJfuRejfsB9G/DEVvP4fQNxTibZmFq4BFLIwjCUg/r6d6ycg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9338

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 commit:
	commit (c0b70f05c87f3b arm64: dts: imx8mq: use_dt_domains for pci node).

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

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v7 to v8
    - fixed comments
    - Added Manivannan Sadhasivam's review tag
    Change from v5 to v7
    - none
    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 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index a1194f0a4c084..06aa40a185283 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,17 @@ 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 no "linux,pci-domain" property specified in DT, then assume only one
+	 * controller is available.
+	 */
+	if (imx6_pcie->controller_id == -EINVAL)
+		imx6_pcie->controller_id = 0;
+	else if (imx6_pcie->controller_id < 0)
+		return dev_err_probe(dev, imx6_pcie->controller_id,
+				     "linux,pci-domain have wrong value\n");
 
 	/* Grab turnoff reset */
 	imx6_pcie->turnoff_reset = devm_reset_control_get_optional_exclusive(dev, "turnoff");
-- 
2.34.1