From patchwork Wed Feb 26 02:42:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 13991427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E90EEC021BE for ; Wed, 26 Feb 2025 02:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LCnAHGJ7oBCSYN70Ba/pPsePyGFqSLPzp/ab+fiDDls=; b=KkTNYIsYdDt7IBHhugIJ2bOEu0 C4RPxSsjGZn4eZJRz+zssmIH7Mu/mNz06zUKY6oaGYc1B2zCCVdTLh5cmzDCp/jhOB1KuKwZOSL1k hrBQaTpEvU+MIW7DhmN3L6y23SiFn1O6LKvYdx7WYn4KqHsK3NREVlWiVg1G9HgIgt48muFHtYmOG Us9xU9xxSyxC3ba/Du02vzNvYhglSsjevZ9kNWDI2Skr8uIsH1LoGgd65KiO0x1pu9PVmOgECOSEQ XxleYqjSobcwNQ++UCE64jbvkPcWx2KbbWZ1310hCipo8X/Uz4P6garvS4UIdCfzRnCPk8s/i9c2X coPTOeDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tn7Xh-00000002Dtw-450A; Wed, 26 Feb 2025 02:53:01 +0000 Received: from mail-vi1eur02on20603.outbound.protection.outlook.com ([2a01:111:f403:2607::603] helo=EUR02-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tn7PA-00000002CZj-42if for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2025 02:44:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uzzFmfaJ659XgXA30zd2QfaqKZ8+PPRSEqrm1kE7TG8iG6svy2C0Xh1uyWk6CiF55Zr7yVMZ7KFQb8p9ReshtaAps8DfgU2shpZrC+f+ks64PEpHfUG7LuA174toM5V0WqR9OCMGUD3g9HTTjd+e5nKLB/+bLuX1M8XH3XuU0gHcFNRIQf744SbOUiW65V7UpaQ5bTrvE99uN+BIWM/ITh+4/MqrQUPRhK/6o2FLM0NSWNOIDYgcITzqjMJR0luz7mGIWQl0s6wb+UwfXraMV1IsPM+VhamqSGZDZ4ejOUbC9KutpywChLbMPE3/RYZPiwhgXt3WpSC1nk73wOsAGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LCnAHGJ7oBCSYN70Ba/pPsePyGFqSLPzp/ab+fiDDls=; b=uVKpMPpMaPX4B5XIZ+w9VBb2Jp3CQRrSi3fd7FLhAgIuUJ/+BNWdQN00uny8M70TWFojzK2OX2Q5dmuoPhJBxxaEV4etM357YzLSYZYYKT3MqKxJqMt3+vGFg3wfAh+Bb+X6D8dK2vxbTgfDIm5q6x+gu8naHhpgkvSVBcWXd20Op5WDyHc28KUw19XsRixlhptfu3e7+5RnAT80XzPQiSrxXEj84FJU2mpinAbZhbzcfBKTw3mkrNVk1OWQolmJhIjQD0GxFbn79ZabI+RFRGSSH8Yizx73oBygVWZmXn//xaaSOcQcwiinasTBDaxEvcan8wt27tnnZvnjWDivQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LCnAHGJ7oBCSYN70Ba/pPsePyGFqSLPzp/ab+fiDDls=; b=TAUG6ehZdpwngyFYfQO29V9IwBxFRHj7r2uKaV+cydmK6syybO5shun4GiUZ5JhUlWlhFDfKgq9HY5q1kopU47qVnb7DOgyQKLQ4m8kxAmr0i6qBcnGxSG46lfFnnNbrKxktQpohIFFAmSfHKk4SL8zPD8B0os0yRarGT0OdVIYo+WeipUdVh+zvE4YQtQUgdCZG5aRj8LuqycLKmb597J3vlh0YkDkXKw5syx7wNsuA3HbB3dEM8CJ1V1rSDxz2vtdIYoTsofJaEOX1uuG7Qc6Llk98xMLkrRcqvvva2/ZagKYShjQf01qWIz8g0YmZpisYAJKJDpOFstxtLMWUUA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) by AS8PR04MB8387.eurprd04.prod.outlook.com (2603:10a6:20b:3f7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Wed, 26 Feb 2025 02:44:11 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8489.018; Wed, 26 Feb 2025 02:44:11 +0000 From: Richard Zhu To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, l.stach@pengutronix.de, lpieralisi@kernel.org, kw@linux.com, manivannan.sadhasivam@linaro.org, bhelgaas@google.com, s.hauer@pengutronix.de, festevam@gmail.com Cc: devicetree@vger.kernel.org, linux-pci@vger.kernel.org, imx@lists.linux.dev, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Richard Zhu Subject: [PATCH v1 2/2] PCI: imx6: Use domain number replace the hardcodes Date: Wed, 26 Feb 2025 10:42:56 +0800 Message-Id: <20250226024256.1678103-3-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250226024256.1678103-1-hongxing.zhu@nxp.com> References: <20250226024256.1678103-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR01CA0195.apcprd01.prod.exchangelabs.com (2603:1096:4:189::17) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8387:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a341803-d983-4c64-9e9d-08dd560f733b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|52116014|1800799024|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: kf+fQCpfV9cG5sPrEbnlbGeoNCoFNnAV6W2eW5mLTPf74AOsHK27G3JT0M8yr4CmfR9LQn76uiURp1q9sRfav3T52xM6PIS5lvPmHTrPcvY7bv7QmLtCyqZiV5ql6fQuLY35lqPhrnJAXB4H90bzKT7bnNWgXQj5WuC9cJ8vn5iD6Cyr27OkOjMWW4FVtvtXR3q0RUZKhF19DLZaG0xb0xkSPeNFKDwUmwdvYxC0jlFRvI2zNQSj8i6IcOJtUPqcETLJYMbfmLqRLFQNip9ywE0aa8pGa2XeFcWP3VxC0v9WY/UzQsWMHm+OiQEzb+m6f8TRAzBGcEV8770LMcS/JlKLk9ehlJMRfkn6fPynhryFLRk/Bns1AdTr7F9Fz+CuhfgJR5X9bMrdMj+RQhCwajXjZRsdHEW3zRfFrG8WlTnghx0Kj8UuhRnkxAHxrYz0MsbPKKARSIpemoWlhOcwVcElXmT6YX8maMTV2GS/urIFYf39V1e4v0Y0TUcKXhm+ZNkhUkdPOyR2FwdXc/Fs3GzIAWhawuGN4BAfxdgDokhxxX8jkfaCdKde1FlhGafHC4JGHJTajYbCVhNU90A12ANro+dQ5EjLJ+yxIfkufi3vJwmAaO4QNcy0YIetLUSjUIk1oOD10fPiMmPPEZyiUq1TFJ8SCW5hLXxYsnfTHRnGWmGsUAdOycsHPIPPHLtxABZdvAI6GLntVFXaothReGJQvV0gxFrm4xZ0XphXxi1sHRW1CjEwTnXjCidLVPFBwOOBQb82VFq1Vlau5hiajnZ+JJj1MCicKYG22toan718VlDOObd1N+OnhZAQ/BwRgC0cVmIU0wc2gUc3wElEYCYhWhs3eOvBNMCMU0CSTnkvkafRlXrOIl9W4eKo7V1oLEULG9QMXMpbw0wck8tkYT1uuEA/XtIFt4GKb1Gt9MuV5XhcMleoxbkfBzavTEwlvkU7/Y3H7egVJvasHFO+N5dq7ezSUnjKXOl7jbewGTCSlWig3vp03N7EpKOQD/BwbbwNYtghmIdlWjqqJ0FuHjW/EP6wxLg6VVQ4K1HP2yG1KLorYKSx7xW78B9SHykodaHZLelmppgBwXz98LFp7W525AqepqJKtie/nsWrm3Ykjg4uzuYw2I817Q439k7ra7FwZg5+XuKXnTP4X3a/tJHIvCD09MPo9tIMdayzqgpd2QURs7lzwRxJSnnGpkgNE77ZNAbkaiWiZVPzETDoQJP2ouRt9XfL750G3TZZ8YXyL3v0sYGdHcv2bNoMaPQW18lMEJykb+ZoGllgT/HY+TJNSKTh3uZUBD2kegApBHQcS0QBHpmVN5Ttq4PlvxLN6jd4kvClsZVa/aq/QjY522IYz1er7XyOBsvUOVLIkp2ev46G1KmB7ENuA34363Wbqayp/qRhHMxVZUuBakcrBhdYW61QFmHySlyB+A0JHiP0JmaNjamtsE6JtTU6bQt62jt+0kbLoaGxe0F3A3MltQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8676.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(52116014)(1800799024)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lt+qrMt1NwoPmN4erwWhJCSZTxwmxibN7cIzZCuFzf5PDgSJgleKiVal/gezD7jBm/DBBiRe7r+1ZmQK1g2j8bUcvXMgxq+44aFbw5/iP6EeqpxltnnsHUW4DuNIv3PfSdusXIn5QHpochvQL1wiLB2saC43Z1ectms9OkJJdIv3iWzFCXDw0K+WO+p7PTLs4Ghp5FBXcLGLPwjGa+d/2veS2tWWYBETH0M4EDwFhP/W5QleVUCyDK5qnTetAAUjSzOT4Ux7DvG5kdw0q7ptYcAwH6KVai5dQPFGUY/pVAbz4Z7CLBJ7ylnU5gQOCMpw+XabFDlB6IJGIlps4WmHRzv6d0m34y+i8vP9DB4PvG6slgKIBqrWNwU4eAfmc4vycWNGolROXf7+JcXwH+1Y+qnSnQn/zkT+jkttXrvFvJSORXjuOMiqVBI5dIT+BZ83be6hKYRn3C1PBynRq2r3xrrpK7lspwfu1tMoxOVL+g0G2BbdCnHIQZfExny7w4tDZxQBtzv736oja7BjFATWD6WjM0bIt9+GFEW/01OhXHP1coGXViDv8vCtTbLD8Qi+u5Zg7spr31SS7IKXMItlxo+enP0QBlbZI3QQeFYC4wUKCoONRaTH5Bl+ldLqk/sRjtm93GbVpftpP79komDrGVf+e10iC99IGwrIWLiIiweHWlsdJ3hTJxyThP4Qp3dvB4gOyp7A5yc8vXCJsChezEDEMBV4RSjKWlqaVlzcGsNIHqmlSlTQn5Vq9N293F+3RxNNuRkdIkHoiAknjkg1sUiYiUdaPxrmbeMyEzpwIAESdeDv06v4daK7NPqEHJ1oRb1IAwGPashx21WPQbdt8HEnTzbIaPE1MF/2PvC5mngdvh26pCA3PE1PMH0H2JpfT5MGtuJPErwkZXIjuIh8uCIgzK9DUXr8YcqvIVJz842v0jNtTurPGn+NzuGl9xYEsFKrh2ffQvxCD08vz+GM3IhtjWNoGvi4FtzJuhiX2Xzuqfhz4WUt1z85Bbpd/NenHx3zO594ff/DBaiSTIFXNbfHkkjg4dDV4RH8U2ssLShVbrw6xYrnat61TZegidgvxogPzgStqwu11xGKkj8rl2aOT4TzKNX6+0jFouE+HWeREYUj5v1UTbVT29wdYjtU3gTHyotZhnET+UiUUBLBr0bccQqPFa6jofpO+Wzh5ThUZTIj1UJC61iVrWqIoDqvSKE2ZyFvkmZu2LMm06QVrqEd6aqNORTH96S/FbBqDuTgKw7N0mkmwTmiWT9LtVYZNDxH0ApQO/Dj9QzFH6t1yQJfPrnj1zttUAAI5C0VO6tUPUziPcmMY4e1JafwATaPhldyIlj0RxlcTeYIM/yGheuqtHAf/zmuvDaYv+Jn0Nis+tt4vsn+azMk/IbMFX0wL/cV9aq+2JfmueUjh3P8BHEiVbSwokAh54iWbuj4o7jN2fjB8JjpeW73AihLWdw+quQlzqt26q4Xz2ZwiCzRnFYEOIB87h8YJZaRJRhy4PwE57G/C8aEBMG3v/Jlp6Bk9SLOmpBb0hqNtpcyn+P9hzqLttOJhhLva5QlKUyVhTkGnNF3fFCoYryiRwnomifk X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a341803-d983-4c64-9e9d-08dd560f733b X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 02:44:11.6460 (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: QjZOrSd3L5uOyUsKXWPjmE7RCNB2uq2Lb61SVc91CofkgbQdc+fuTiZEgFnS0Hru+0snE86ERiyIjJcpdP3tfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8387 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250225_184413_007909_492F829B X-CRM114-Status: GOOD ( 13.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use the domain number replace the hardcodes to uniquely identify different controller on i.MX8MQ platforms. No function changes. Signed-off-by: Richard Zhu --- 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 90ace941090f..ab9ebb783593 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -41,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 IMX95_PCIE_PHY_GEN_CTRL 0x0 #define IMX95_PCIE_REF_USE_PAD BIT(17) @@ -1474,7 +1473,6 @@ static int imx_pcie_probe(struct platform_device *pdev) struct dw_pcie *pci; struct imx_pcie *imx_pcie; struct device_node *np; - struct resource *dbi_base; struct device_node *node = dev->of_node; int i, ret, req_cnt; u16 val; @@ -1515,10 +1513,6 @@ static int imx_pcie_probe(struct platform_device *pdev) return PTR_ERR(imx_pcie->phy_base); } - pci->dbi_base = devm_platform_get_and_ioremap_resource(pdev, 0, &dbi_base); - if (IS_ERR(pci->dbi_base)) - return PTR_ERR(pci->dbi_base); - /* Fetch GPIOs */ imx_pcie->reset_gpiod = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(imx_pcie->reset_gpiod)) @@ -1565,8 +1559,12 @@ static int imx_pcie_probe(struct platform_device *pdev) switch (imx_pcie->drvdata->variant) { case IMX8MQ: case IMX8MQ_EP: - if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) - imx_pcie->controller_id = 1; + ret = of_get_pci_domain_nr(node); + if (ret < 0 || ret > 1) + return dev_err_probe(dev, -ENODEV, + "failed to get valid pcie domain\n"); + else + imx_pcie->controller_id = ret; break; default: break;