Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Frank Li <Frank.Li@nxp.com>
To:     frank.li@nxp.com
Cc:     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 v3 04/13] PCI: imx6: Using "linux,pci-domain" as slot ID
Date:   Mon, 11 Dec 2023 16:58:33 -0500
Message-Id: <20231211215842.134823-5-Frank.Li@nxp.com>
In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com>
References: <20231211215842.134823-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?2zriirJaXkLMfW88lHg4YZZncS9WHTzKfP4OUWXA8ecDS18tnO8dKnl9FLEw?=
 =?us-ascii?Q?JcTXAnWIE2hw9IdYzWzu6LWBrMaKf0SAxMBTIliXJnlDbdjcXz1uDGOmLA2m?=
 =?us-ascii?Q?CUlIAEe9Yptj0uDfjeEHqBSCznugOAyZPzK2pUG4GbBTNhhnjg22VmCNEGIF?=
 =?us-ascii?Q?MMR0qbt0R3LxMK+UBocqyct+zPxqg5D7j68hbmHgnk1pvvLitIZJfiNnXEo0?=
 =?us-ascii?Q?gnk91kES7IdO0ed6KREKC3rG9G16w+A7576SvDFhHWRX9WW/7LnxuqwKObmA?=
 =?us-ascii?Q?RCs39lXGdlOpj/4X4MNRAy0BY70wvKXorkEgME6OJk4x4bCOjkypJY9n77qd?=
 =?us-ascii?Q?/axhzuaabK4Jnf12X64rIjNMBX8jBQSwvg8lRRVVnysmaR2VPS9JVo95CUbF?=
 =?us-ascii?Q?CyDU/woG8j+t5IqhHqDm5f1HQOK4pEKbGFVvNZBZrmRoiDtC81TAz/ogSArh?=
 =?us-ascii?Q?qGZ8deZ1YGWtdGYjAenB6nqvrjKe9GzQgJWVIwPpmI1ZPD6CfDNvrfUaO19l?=
 =?us-ascii?Q?fqTqa0cWgB50aK9jCYF/L+70WnTeUbwoV3f9t5YQLKc6OIhPBQjfv9yw+lS/?=
 =?us-ascii?Q?RXzz43ZJ6FujrnjPh4ehZiQ15Fonh2XDaglOCaJwMvKpqoPi407ODqA8z2VT?=
 =?us-ascii?Q?MwcdyLsj9iQL/LMirZdjt+6WTOda72qeFSjTDUxn6/S8OP/6sgrjk4548C2D?=
 =?us-ascii?Q?VDwtjVXxEdF6UDo0raneT13f65O/b4ke83N6OKpX8OBrVwhVc1kmzln238vv?=
 =?us-ascii?Q?xznAVLKmZh67rvie2lp6JZRicyE1ogpsTaUD2FvlpVsXGO/lkciIrax5YeaX?=
 =?us-ascii?Q?nCfRvDdpMXlWw3Jv71jcl+rLGKQDVrxtVl8YWmPG3FxBclu3jtUW8htMhLl5?=
 =?us-ascii?Q?zehahGMFIu67Rw2osmcpKdIsi5TvqIIWzgnSNpANK8U7XbKuJYShGM7kauRC?=
 =?us-ascii?Q?wxxkGZRxrSBSwwO4kkagyBjlhSoUKE88nP+pU1tdrpkhvePe0YJALgQvhpJG?=
 =?us-ascii?Q?EnOlJJKsBozltlGnOjLzhmgSjMNoxsCcs44KO4BSIHTOv//AZfvlAtHso/Hx?=
 =?us-ascii?Q?kikOrMGO3mnip7Um5GPUED7/C/ITF7Kw5BVBoZFlV50mlo7e8S7qWBUCFZVX?=
 =?us-ascii?Q?42DQaLSP2p3nyTPmYv6kmS7pN7d+HniIfglK+ZHCvzvKJ8/5uAD7RZv8B/si?=
 =?us-ascii?Q?jDP7IHPJ2RtdgQ3a7lfd5aUe+INdyokQDx4oS8j1fYgFu3G/yf6zaHs304WU?=
 =?us-ascii?Q?SWcB1nY+ZeQGp8g8jzmLCkOwqZfMt2pyLwl3Mgpa2WWM8tWNMkVc6OwxCpTs?=
 =?us-ascii?Q?cEHihbiBgFJ47NGcM0Tb1AopYAH6+ZHOz2tH4RPtlvPtegZInPotJSIzX230?=
 =?us-ascii?Q?AnCH5iuWtDXast8o+fpocauj5a3UTmQ/HnxoNAjTcFyoyH7aqpT7RYRKow/f?=
 =?us-ascii?Q?5jOeiM7+zkL4j08+6TmKolG3iNwRH5rFiRumYgbQjyW2QUuzp+JpUXV4Iomv?=
 =?us-ascii?Q?3Qs5dgyek4aZLVL17mkXJ9kNLh/19R0Xp5zJKVqjwG8hUr4IU9mcMjvOSKwx?=
 =?us-ascii?Q?6OJrocHoO+uCAFy5cV0EUyPS56fpOEPgL14Uji1F?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 17711b2e-47d1-4d95-2715-08dbfa9479c3
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:41.3360
 (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: 2UKnPjSkGyheOZRgQkRiUKQCR7S0RQNbITawmplWRkL3GNR4mvGSPwDx+ngnFI8dGEtqC+199DN0tGGHg9SxWQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569
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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 11 Dec 2023 13:59:56 -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>
---

Notes:
    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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 509d459bdc5a1..548034151ee1a 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)
@@ -1327,6 +1328,12 @@ 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 there are not "linux,pci-domain" in dts file, means only 1 controller */
+	if (imx6_pcie->controller_id < 0)
+		imx6_pcie->controller_id = 0;
+
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX7D:
 		if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR)
-- 
2.34.1