From patchwork Thu Mar 13 15:38:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14015309 X-Patchwork-Delegate: kw@linux.com Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazon11013041.outbound.protection.outlook.com [40.107.162.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57182269896; Thu, 13 Mar 2025 15:39:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.162.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741880355; cv=fail; b=u6BcbdJUY3GcNwoyC4jzjjj0rPxT7PEntJwl6ABSqaFmaRqpdLLJ2xYAfWMh2bfVtEz36cZu0o7Y0dmQV1v6kWktNc3MnMRy+BbZwXoSf/AFMXComaZl8yB8h9LoL2hG6ce01wfJiFFTx33xrAhrQhVWSMkuYs733KOuEmC4XhI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741880355; c=relaxed/simple; bh=k9jjAZXXya2Q8DdbpvyP5IdKBBPjl1TDyYEBtX85b6E=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=XSVKnctgZawwT9qT5L/WUyZi3BSwlYSQLQgeP7EzonBf+JKFyk7lsuKYdsrGvfIEwNKCWi4zSbZgHimm5XkkOVQM7deyu6FGOwHzxndBeBR7J9GPjFWtbEWWLMi6V+v378yXNS8ZWV0pUjI2UBQYeuSt2UHji3wVDX2xgZN6758= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=cBBqn1CO; arc=fail smtp.client-ip=40.107.162.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="cBBqn1CO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SG2v+vrrF+StX4SZyS0d9IgQI9TvpaV50sInUW5qaRUMtIwXFxRmwsUFAw026QKSBa4ReG/Vdek8lyxU1qr2y2v8np2WHApMyjxqf/Pv8L4lirL9FZajpCWdhPo98pr1eQAJ7cO0wW9esg0jm1WQu749wU2Od77ccuEX/DuQrTXfEAGy7PlSaxyJbuKHjLHcjpKmwap3u9TmhqJAvjfrreMKsX2YDDhXQUADwDXwMEREBJET0ZsLLHOhPA7smV4BuyWxNpjGIgtdOsHfw2m6BapYxfCM4qmyUk7jAMfQDal6t52MxwZU7ylZiVgndn+5K5FXcueYGyFm+rK4AEac2g== 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=4oxuv6bJx1270PTY+vW0lcN/N+3YYVKRePdGbD++6zw=; b=tae40nrLGW5NePmGLIgonI1qc1SIEtkEN4gcyBsmWba8+JO81S1HvS/3wUQ+Fp73RIYwYcBCGVmQc59AKS+EWLWRLOyt3j7Ci2ld0D+cGt65V2y2T3dsvczcWLY3eMzlsPyMFi6hp0HMrAkCGHfkzFoIjlDQ77ByVtLofWmRdgWjOJdLwu3f++7h3VF83jVVQU1pK7GrrJHD7U4yyeqfdeI0uTiw06UnzFp5eAzgsc6wX2zyyUxMv23GU5dYgSk80MVixQtunABkU6OdCGfwgxJOvOmkvdSsGcIJljH+2ARalHPxoD9WUC9R49Ioczi7+Qnei6Z7TVF+SdO6P+JXuw== 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=4oxuv6bJx1270PTY+vW0lcN/N+3YYVKRePdGbD++6zw=; b=cBBqn1COswX2LUDYF7WHfoV3cska7oa4mlPxM2UIfZl1tnih57LbXUiPOeDEBDSQ/L0y0oNaFII3bqg0PIjJG/EzAkWMr+7mIVuFsco+oDDv9UFqHxO3wf7vuinwz3GDO1zR1Yav4oniO4shSS/GNs/kegMLhW95yGdspmFkqbdKn9mbN9i7n0lV/20cycSh6DzLeJhNPpqNcrmqemVdq9gOT/Iiv8xMgVQnoxXdExPtL887icqIJzQN1/SDmoXZOoV6lYMP+zTM2G6O8jCQyGCYH1KqHoaOkXzjs5wyFS1/M9WlzQ8LAdbgaU51YsFvF/fEFuW5aa57TJRm/KFs2Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AS8PR04MB8119.eurprd04.prod.outlook.com (2603:10a6:20b:3f9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.25; Thu, 13 Mar 2025 15:39:09 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%3]) with mapi id 15.20.8511.026; Thu, 13 Mar 2025 15:39:09 +0000 From: Frank Li Date: Thu, 13 Mar 2025 11:38:39 -0400 Subject: [PATCH v11 03/11] PCI: dwc: Move cfg0 setup to dw_pcie_cfg0_setup() Message-Id: <20250313-pci_fixup_addr-v11-3-01d2313502ab@nxp.com> References: <20250313-pci_fixup_addr-v11-0-01d2313502ab@nxp.com> In-Reply-To: <20250313-pci_fixup_addr-v11-0-01d2313502ab@nxp.com> To: Rob Herring , Saravana Kannan , Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Niklas Cassel , Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1741880335; l=2742; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=oTmyMZfU8537ytBOcf3bYNYM+J10fr3vTNA/77LnHNQ=; b=m/jPcHO21NiZcl4xWUhm/nXHSQNuM50MwSruWaaPH6o6DNkqoR1R3oSrT2X2SQcm7MXZ6Or0+ 9EVjGgHLXK4BoHK3VEoAYuy0y+NUGo6WGMhSW8H5H4iB7lGewKxR93L X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SA9PR13CA0038.namprd13.prod.outlook.com (2603:10b6:806:22::13) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AS8PR04MB8119:EE_ X-MS-Office365-Filtering-Correlation-Id: 6549a310-2b5a-44ae-0c0c-08dd6245324f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?iR6dAF26AXVxVRgx19r71BfnQXAg/k8?= =?utf-8?q?ioJYiPgttEAnQo8aSacbNQLr2t5r8XhFR+TxxjQnOjFZxc8nvRQ3P+yN3iqtdfmKV?= =?utf-8?q?Ro1gsTwZz4NGiW2RkiILIiblmiNzqg4PdvcUkNYCIuZ/gSDr0JXF9RJt4b6JU5NBY?= =?utf-8?q?d90w57x2bdtZTo30v0TbEmgll+1qfmsAijGH8+KCMLSQ6FrhWWz0z0PdqTPUFE7SR?= =?utf-8?q?QofWyLLrIoPDIuXh6c8z19GnhZr38oe7IVDd8w/mJirVJvopeX7gcy+9h6trQJqFF?= =?utf-8?q?nANjE0yhjK6Wj2To8+IcbGiFjNvKZtHb89hQNyw6tt9jkPL6N8HZbHftsafyY1yCX?= =?utf-8?q?QSsfcaG387ep8wW51m/UXVOTRk8V98lxSlaVzyZ84vfvjJwUBdVQl2/OBgJrTVuta?= =?utf-8?q?9ClTapiH/a8UJAgURlbViR4xa9vFK0PsRRhb45VkoYXtdT+JdMHSpsBCzda+XU+1K?= =?utf-8?q?oNJJJU1N4vX3/LHtpYfN3cyXCbX1ULq5C2xX2X84yGb5CA66AnRuOkc0+lmrByd45?= =?utf-8?q?rF8ky5AtRriPDC1WOv4eY3lnfqTMc7EjGBgfUkw5nnOCXFKAkzyUCumVNpPHwsS5N?= =?utf-8?q?zJQWVka2TTZ2b2MdyihagBZh0renPNUBF00px8bd7xz+oIEs1h/acbkqdm5Fyoprz?= =?utf-8?q?aAxTcCZ5a/tELvRuePgMNIRsc9aTm5EW/TdmrhEHJd0c+HAEF9iXRVuOSAFvSc0eI?= =?utf-8?q?SSxaQST1gfz2lF5qM8IRCITenfkyPj5gleKFc2AB3rbZjAx6FKvrkisczwoqcebVv?= =?utf-8?q?nbZwLdJtc7uqgLZlS8aT0IiZdgojzuWFfoFUMeApPAZSQJsKomJfeUEdnS/JM0Bb3?= =?utf-8?q?iAdyxXnDgQcnsVD8JdA27i+SC6w2oFfXWoF25NaWBENklD4lX+mR/y5/N/aKriC78?= =?utf-8?q?kAXqsPqf/G0ogmBu2GYwX7Nd+DPE8+PxDqBPaYkahS3/cqApB0xbbAKAKxIOl3SNB?= =?utf-8?q?JqCfUYAJ1/a1cR/wa9vM7XdX/k0PJnyaWBV4T6LAUgY2HSMntGTCjtKTL2YtWt/WV?= =?utf-8?q?Ff4+6HpUQU54GX8Il0+T1Jg4+hfrJcpaZUh4VGWYzce16uOjMBjN3I4DttvOyUsz2?= =?utf-8?q?Ut2+xksBUwHm7wb+DTBcF1/UDkk7vm34Ey3TI4Jdm9PLIoy0J9o79PzsnWNwlMXfP?= =?utf-8?q?uU8+DNfEw5Lh30yTdxdrHm0xkHPVEE8XmtHP6acnDjkquHFDcydlpcLhYUqwSqGYj?= =?utf-8?q?H/qGecseD2xzbDUAiqKYGunxbgGBhGXEg/7Y18qgc73oexqT7v1yHSqd2e4u6qp84?= =?utf-8?q?zt79KOF+v+jQJBF6eC93tJMG4UNynlD8yv4MkVbMyWwNusUQ6fn3uLI0AnbJyvUrW?= =?utf-8?q?4YBBHzAPuEn/awXqs4BMKhhBUOjt5LKkew=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(7416014)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/GeWJkvY0LCVqN9sNWVjeWKFCGft?= =?utf-8?q?Jw32TCL0s2U8qdWZy2VEFD/HwmN2xxP29GkiFOOlo+QhMCn690Ja4T71pUZZPCBpj?= =?utf-8?q?csDbTpjsm3KMHrlOpNBqi7J68PBUDgL+T8QJNRB8aQQFWp+/oCIYo/NQqpAAxx77G?= =?utf-8?q?wRl+FK3GAPCReIO6GE/epFp3D0r3oSpFXVmb0WXNX8Oo+mzJntBcZXLfQxCkkvY8p?= =?utf-8?q?bGmPjvZ6tIzhl+3WsFN337241GQK9vpolu+eVZD6E49ebFMoDCWZSX4UwJ7JQuzJK?= =?utf-8?q?AlEzVQhdXPePadcdD4fppPHx/et3faG3m7AT/JTp4ZHujdu1hKHoKX1JhVDlkx9DB?= =?utf-8?q?fHEpz9Ro1kOGiHrODBpMLK/RoqRvN2YmySAquKj0LG3HiHzkjOlJkT8ySasjTxIdq?= =?utf-8?q?4aH8yWZFWAnLsOau/sxLDXzSnyoGuorKj8GR25XpRW+5jfg0KWS0Opr2lks0KI50/?= =?utf-8?q?sf0mvi7aor8j0J47YrIyN82yuA85/OscL2LnXIPAHIzB5TJzBar2+Lwun1FOYrv+r?= =?utf-8?q?tQN60xhOb3zmKU5yviZmQfVb0NHMSfDx5DTpFKu44jPTmb/ll3JDn7GvULnX8gsnl?= =?utf-8?q?b9GriC4KxkClqWSV6xuJrN94ZmY1/dmu3c6hvRfe5pxGTdzWNBRgPUm1wRQ+owAqy?= =?utf-8?q?VOADqS9InukAAmByBp6W9Ulwg7wDMvNeTHmE0blf8zHTY+3D8ix4go4iWcB3HVd/5?= =?utf-8?q?wVvmJGGkoOOAq1XGP/GMT+AKJVPMJgcZQcCh8/8RQtPr170FtZolUSAZ2Fb5ZW+6w?= =?utf-8?q?dElAsR3ULuqXgykOtcxBoVGbH9nGotqlYE4Dw/9CrVfqdIR+A41jAwbbIouulEC9X?= =?utf-8?q?vKMVPMy36pJEsr20Bibe0Y1DIglrGKXRTKUrB3y4KoxkggCRvI8KhM47ufOBydibX?= =?utf-8?q?Th4cjwFkOJCUkd81j09FHr/uRj4eyGqpa5jy1YxNAuE22tOPe5tJ/1kyttT1OiAT4?= =?utf-8?q?pOVXd5jolVrIt8AaF5dgTvrVsfFPKDdI50EUZCV2ICivXY6mysGSD1aW5bqGKsZVN?= =?utf-8?q?w2M/Mi7jIh0YKULl3qjURzc/m9RCe/mIuPAzHSDeIy8LG/HhPbtQ2FMnTaIMF74KW?= =?utf-8?q?s3xcwyBP5eFqDwcbpeNsx5oArE6XE1NnsOUqF33UqgC+EW/gwSf8rt7Wi2aP6+gxz?= =?utf-8?q?OyXDF/JRQbRAHP0zAWXKtdI5v96kCwdSObwEM1JJqt4oF2ZarGmoctmVfSMjqbAnv?= =?utf-8?q?nSK0Y8MvO7gScOkRECiuFlhzpwUbQNtEKSWWwBra1M07cnt802VmTk5TRjqos2xyn?= =?utf-8?q?YX/qejcVFSn+gh1WQy5MvBX/dwRIUbUPLMDbHjLa3xiFFfwiwbROAgHr+iSZ/jG5c?= =?utf-8?q?wwJUlte5bHSgZ8f7MX538ziCjlP1BDQZqJaz+uiAsJNyzatXxN0QCSY1xrxkFkQu6?= =?utf-8?q?Fd55yXZru9dKLHK8T7Qg8t0aHmOJZKp+je7Rr63GU70ZIV5qJM6GMQ+jVG/glZSo/?= =?utf-8?q?ADBUgJ5qEa7K8VJ3cOgvOyhcBtGxJ7M12r7Isn/CoE0PQJiMqV+e97Ouu2L2FX00d?= =?utf-8?q?MxUwbhTMGjwk?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6549a310-2b5a-44ae-0c0c-08dd6245324f X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2025 15:39:09.4001 (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: TZn5L74T7wIOtZ4xjQL6IZJJfNrVpu3GA6iLfG2m3h7Wni2QCZiGGzkdIGiQzO7B8yVoYSJ1C3Oi+vW7QkZZ4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8119 From: Bjorn Helgaas Move pp->cfg0 setup to dw_pcie_cfg0_setup(). No functional change intended. Signed-off-by: Bjorn Helgaas Signed-off-by: Frank Li --- Change from v10 v0 v11 - none Change from v9 to v10 v9 means https://lore.kernel.org/linux-pci/20250307233744.440476-1-helgaas@kernel.org/T/#maa0134c1826bffcccab6028c7732a13f7adcec4d - move dw_pcie_cfg0_setup() ahead of dw_pcie_host_request_msg_tlp_res() to nice git diff and easy to review. --- drivers/pci/controller/dwc/pcie-designware-host.c | 40 +++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 1206b26bff3f2..c57831902686e 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -392,6 +392,29 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp) return 0; } +static int dw_pcie_cfg0_setup(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; + struct platform_device *pdev = to_platform_device(dev); + struct resource *res; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config"); + if (!res) { + dev_err(dev, "Missing \"config\" reg space\n"); + return -ENODEV; + } + + pp->cfg0_size = resource_size(res); + pp->cfg0_base = res->start; + + pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res); + if (IS_ERR(pp->va_cfg0_base)) + return PTR_ERR(pp->va_cfg0_base); + + return 0; +} + static void dw_pcie_host_request_msg_tlp_res(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -423,10 +446,8 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct device *dev = pci->dev; struct device_node *np = dev->of_node; - struct platform_device *pdev = to_platform_device(dev); struct resource_entry *win; struct pci_host_bridge *bridge; - struct resource *res; int ret; raw_spin_lock_init(&pp->lock); @@ -435,18 +456,9 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) if (ret) return ret; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config"); - if (!res) { - dev_err(dev, "Missing \"config\" reg space\n"); - return -ENODEV; - } - - pp->cfg0_size = resource_size(res); - pp->cfg0_base = res->start; - - pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res); - if (IS_ERR(pp->va_cfg0_base)) - return PTR_ERR(pp->va_cfg0_base); + ret = dw_pcie_cfg0_setup(pp); + if (ret) + return ret; bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge)