Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
From:   Frank Li <Frank.Li@nxp.com>
To:     imx@lists.linux.dev, Richard Zhu <hongxing.zhu@nxp.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
        Rob Herring <robh@kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        linux-pci@vger.kernel.org (open list:PCI DRIVER FOR IMX6),
        linux-arm-kernel@lists.infradead.org (moderated list:PCI DRIVER FOR
        IMX6),
        devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED
        DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 4/9] PCI: imx6: Using "linux,pci-domain" as slot ID
Date:   Wed,  6 Dec 2023 10:58:58 -0500
Message-Id: <20231206155903.566194-5-Frank.Li@nxp.com>
In-Reply-To: <20231206155903.566194-1-Frank.Li@nxp.com>
References: <20231206155903.566194-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?c2TXuLTOTG0QNSJZwEe0q9y32FDDZ3SCDdnc0WerFjJCW9lD2Ka3iylMNKGm?=
 =?us-ascii?Q?++oX9smq+QlfkGiwy+GD9dyP2wBJx3YNnsPhJdm2fTApqi7tAsVv16PuSI/G?=
 =?us-ascii?Q?QSrGaLEO9R9nXkVzttC5l/h1uoItBW0TapsHssDlBN2DmzfGel1hUNKagC4y?=
 =?us-ascii?Q?mTN/usM4yUehzuytY4M9fDmesl2w9yJeHJfrGxnlAWSuUNP16QmUukpGMWpD?=
 =?us-ascii?Q?2YKRRDTV97LQPiJIGLPI1vKzn8Qw1HNQbxd6qDkwXHRTOiIqL1xgaXXFKWb8?=
 =?us-ascii?Q?NyBeudq/APoq+HgktKf/OWWXga+uFUpt2ORncuI+RX7poBmKFWJZ42JlaESU?=
 =?us-ascii?Q?rMhITCWz/PD/ukaIZntyzL1ozNFqOFVoeJlW9KajLr6XtBSMuHqor3L0Lc3C?=
 =?us-ascii?Q?V9uP0yml9Zy8vgJP9OucF/lbVb7OsUK3ilD6OvFsp/SMnW4K6FqHKQ2f6N6J?=
 =?us-ascii?Q?7TiiFllscK6yztG1f6PPyjZ6Qt8ts7KUmkK+VwCXYfkMa+ar58nec/vqtFUa?=
 =?us-ascii?Q?9gQPwoc/AmzMIUJSZcDLeHBEwVSSgy6Z+Ip54r9MiJg5P6LbbswxdAdRKBPD?=
 =?us-ascii?Q?hgFxjSShiCTlBOCwea5D9s9OKs6W4oW39JhUND2DZVoGpQBE6SdW8NDK7D4S?=
 =?us-ascii?Q?WJX1AVOt+g6TKGBHC2391Tn12Ox9VqNB10+Cz2cWjikAo1xbwN4MvDJB3np2?=
 =?us-ascii?Q?1TYnrdg6L3GC7kEoBeZNotQ6vLficxH3vH5kvGynh8qppAQR6JQuHUR9uUcH?=
 =?us-ascii?Q?pnIR8d0nh+BYE401OXDSTg6Ih8Mr7FbY6VGvTCzbr6oOAc3V+Cc944PM0TFf?=
 =?us-ascii?Q?OhnjCyk9ouF/IKmDnDwxQ7uHoctuletDbXfBbcv2Qi46GrUV4DumZi6RBhc6?=
 =?us-ascii?Q?KYDEEH4j4X8eAEl8r7pGVD99mbk6dWjC5qaVcNQEqak2Ac5A0BziE/tK+yQk?=
 =?us-ascii?Q?BlCeZWD1womjWvrXbHrLL7hofnw8bNgZmCPJwj0XiLcFDrXVbGcahkdIVUJ+?=
 =?us-ascii?Q?9qC4TuD45pE2yaAv90PZHZXffJC9oko9cmwVpsTulN5LBXAuGsNP28U1PQDz?=
 =?us-ascii?Q?QcjAkbNvFodGXePoZ0lJSUGgBVQVjCcSUd8xbMSeTYi5nXt1SwHrS/lZNzz9?=
 =?us-ascii?Q?WuFVGZikpq2QqUN+VhI7HNhw7MiK3vKGffB+O0hvZZ8T65SN1viLepzG6I6x?=
 =?us-ascii?Q?2csQeRK+G0kuMsm8d+Xo2dBCwerpPjetArh8z1nrN/JOXA7lO86/RLoII95e?=
 =?us-ascii?Q?BWSzrKUwO9c5vujeAY7nN7Zkglc49Z8ZoScM1iEFVGNB9/bEfWOfRKf2a4Fm?=
 =?us-ascii?Q?RKMiFTCWRL8ajvr3ld7zkb0mVqJZIvg27xNJtTpiHqKlM9+6O4+rkV6KP71b?=
 =?us-ascii?Q?wWl8B0d7yqKMM70VlnDs4d+gc9b8OIyIf18U2dhpqUjZCS75sys3C/5Ey12g?=
 =?us-ascii?Q?G+tstm4B0+1mJ3995A+KsVqS9xmuZTldAzA58nFT61sCm5orXqJPftEwY0RH?=
 =?us-ascii?Q?EdUFB67JmB8BG33l5/1GOvRnFOTuwMxoyx9+pkQ3CSD9kBLSDmsI9Ma2ORzm?=
 =?us-ascii?Q?XKc6oy5VEw1GrA/3Hbg=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8263097-e6bd-495d-4058-08dbf6745c43
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 15:59:43.0974
 (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: QG0S614hd29oi2NxI8Rmrd3ckCnTiHdKhirUMEG+qr/6RXAT6+2Dncn0lh9y1bP3yOkhfhfSdE8sCqmNGf9Bsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8123
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 06 Dec 2023 08:00:19 -0800 (PST)

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

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 62d77fabd82a..239ef439ba70 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)
@@ -1333,6 +1334,11 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 					     "Failed to get PCIEPHY reset control\n");
 	}
 
+	/* Using linux,pci-domain as PCI slot id */
+	imx6_pcie->controller_id = of_get_pci_domain_nr(node);
+	if (imx6_pcie->controller_id)
+		imx6_pcie->controller_id = 0;
+
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX7D:
 		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
-- 
2.34.1