From patchwork Mon Mar 10 20:16:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 14010644 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 C918FC28B30 for ; Mon, 10 Mar 2025 20:28:34 +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:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rTHKefLycHMhVtsdhP+f8dmoDvue/YvM2QNFOGG2uKc=; b=niwokqd3+d8EF/g2fwKLdx1JHe tzisZTAbD0vi70z7uXEZrb31WtIsUtRgzuQa4WyiP5yIrBLV9j2g4n7o4+I6Z2LAwJ2Xz4mN4r8Cl ludpSc8UJEntLW8AfDgBOdV7N+wXNeKyCYypkPPBbmFzB9HgVpwtpQWeXTLLtW+ObQtr6K1GTaY2X EmXePwjw/EsfccSmwJelS1kwygykc9dbhsAkEmQB5ZF5Q7xvusLwl5jKeqoH0EMTAAq3l4zddxFkj 1is9q65BAq7PDbJY3fmHskbKMp9UdWFDRtqHQEC2JzMD/s5x9T9PmiSVz4bTkK1Sf5cwDgQkjx5Ad HJ+SPyVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trjjd-00000003sWF-0xaL; Mon, 10 Mar 2025 20:28:25 +0000 Received: from mail-francecentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20a::7] helo=PA4PR04CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1trjZB-00000003qVL-2JDq for linux-arm-kernel@lists.infradead.org; Mon, 10 Mar 2025 20:17:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kHj30AsYz7a/H9UidcFG3tGOR/glsaZddcr0wE4be39J/MovqQDimK2DjWiAVMxERXP04IKA+Ht1yiWMcjBg/I0nblARk7NW1wUJuu0I8MU/HOK8MxI/p0eV/di375mLc41fDJk8xz1bbVfEr7vO6ggkhtUQOCGjawCJMuKDzDj4eFnc5dovvGzvVuFP3uFGx0yZ+QawI9jFtW/dGXxmDTCn0/Fd5zuU5Wevu5mvD+J6IRVmYyiYmYQxfawHxYcoQTwyeWkuEjj+CKA/lb6b6Hs0dWljTDAMbzhy78PmcW2ZzQ+IJo1GsP9yI/vTgi/dMdfARodk7KBjTP8yvtxRVw== 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=rTHKefLycHMhVtsdhP+f8dmoDvue/YvM2QNFOGG2uKc=; b=emL1i+0XUe9RKs5D2OFPPHLGx8oLp3HiZmlV4QI4HkCiCo4WIIZDsiJd+UL9Slq+pBa9xCFU29JG5bzWckr6hJ+KrgzkieZHtW1DVFJKWgy4IQYa3VK6wrkOvNH3k91Cp14zKTiWpIq6n0xh+HEUAW70Nq5cmSGGpO4oQ2MsFhCppXm775E2zSpNf242yo/oXB+qwJt1sVxMJU3GPWY+f1Rm5s7O5cnQHc31dPNV/LnzANmriNXI4JrzNJYR9m1qhlBGJBVblE6rFfjG37Dqe/Avdtzz+P3D1fExq9KaTMoyNhebxW6J/yXY2EdA+KQGB5Htfn17Ope4tTZLDqoRyA== 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=rTHKefLycHMhVtsdhP+f8dmoDvue/YvM2QNFOGG2uKc=; b=GGOzA3m1Y1c/3ENWnY/XTOVPExbFaZuMFm6bj0Vy5q4UysGDWghO/kCOzeeRTRofWd1qsZYYOsheP0DyndA2iQUYDIbiqXu9j9AIS7IJ9H7RJ+2YnWRqy03G/jiNSy8V6+B7DJL7+kVb434Oz8YxxwPDSZ1UBXoliSwKbcAMvUtc9R4oB85rRbviPMdE+2+x2qEGBd0vNtuMSSbWOQKvZEj2UKEk8p+eLt1CqIFqr74EEnKVB+2nv8YKH8PfbFs/9Ryi0TIBkaQdUtq7v2B56By7FLUE48bJTye9cOJVNT/3O9KgvhrTaGiy1p6xEZZ0WWOydSK+c0JKU/rO3AY9wg== 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 AS8PR04MB8261.eurprd04.prod.outlook.com (2603:10a6:20b:3b1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 20:17:34 +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.025; Mon, 10 Mar 2025 20:17:34 +0000 From: Frank Li Date: Mon, 10 Mar 2025 16:16:41 -0400 Subject: [PATCH v10 03/10] PCI: dwc: Move cfg0 setup to dw_pcie_cfg0_setup() Message-Id: <20250310-pci_fixup_addr-v10-3-409dafc950d1@nxp.com> References: <20250310-pci_fixup_addr-v10-0-409dafc950d1@nxp.com> In-Reply-To: <20250310-pci_fixup_addr-v10-0-409dafc950d1@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=1741637834; l=2708; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=x8RA+x9r9JuWyFDEhuMcFraJYfJMz2iE/r385KKEfTw=; b=rn34KzUVyIAvWAZIONyJQBCvqOOJxYdjVC16WYZ8Vhd6B7srKqHKl2Btn0uHMV4ipvrgrSQ8L E35tZn4eKELCyepn/aG5uqSqJZ/a4u3na8iedPa+gExXh31ap9xXTiE X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR08CA0058.namprd08.prod.outlook.com (2603:10b6:a03:117::35) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AS8PR04MB8261:EE_ X-MS-Office365-Filtering-Correlation-Id: 79bef7e5-3870-4528-0fb6-08dd601097c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|7416014|366016|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ky4Zw8Z8MoyIip2U8YCh5OWsGOlyloZ?= =?utf-8?q?cQJlXqc7Z6Wh/s0SxwPCXOx03qTO8+LvZJGnPFA8SQaZnfumPQL1YCEi9Q/tiIKW+?= =?utf-8?q?AibabW3FJLDJYK5WD2qr23xT4o2151UFAMoJFZB/ch6v4FZxHWCs+pKW7bH5F8uyn?= =?utf-8?q?3hxz+B72Ts49frE+vY0fNsyYQctcn8ZLZx0MxVNgCYyLXVHW+X7pbKHGeJTIU4JnU?= =?utf-8?q?5ggqS6Da2GzhhKKJ2HrPnfSogR36yLbxtpq52RyoeJGaOLoPBPko3N48aa2dfR7BH?= =?utf-8?q?b2VkDGXwKUMALVlcZcXSsEO/LfMFhaUz93POEZQo9YtX8y983ubK9T66uflUdOUjb?= =?utf-8?q?BvJDB+Azq7lMiUAZgCU9VKbu97wA1hOkKik4imLvqCNYg1L4/nuMA9y4BFZEXkTcb?= =?utf-8?q?/2+wOGupM47c6mHXda2SlWg4+LmNQQJckEy8qo3Z4iDmt/jCRE2uUkEUbJSyecFnc?= =?utf-8?q?g7MZuY0Pe+SBCk2tKRkzVCBIMcRw/BUjqATh2/hvSxROMjFMA7i0++uYf2kGi0Q/O?= =?utf-8?q?REFn9oV+VAldkUb00PDUr/Ux5mBqaz2Ee+P9UNWMVUc+SNvM0Rz5lErsQu7T/bl1W?= =?utf-8?q?Vl20IwQRpFijzmirQovx+qo4Ii+pC4CD3btttzDQEixGceluPWIPdgPvoEeRdMfBc?= =?utf-8?q?8X81KRQ3IkGdSQAyzb8GAJjiZqQkZi21FVX0Y5E0MGUYeyNc5+gFkjhuPnIy5a6a3?= =?utf-8?q?+XXsyXNIEjM2ieAEonshNn3NHHPjjPxpo2oHieVcuxrNo6aqkZ3AlG1tGp1rbUV1I?= =?utf-8?q?qcEFSiwgl1t7ABHNAK/EhekjGZK5rwUvu9Ti08NT/jJqXRpnq0QWdOrYQBqZ3imad?= =?utf-8?q?anP5ObRo4U0gh/3z+35Be/v+fdaBE+EXjGGu+xuP71Avrt/LI/DoU1hEI1ClUPnaQ?= =?utf-8?q?wmF4c6dNv3hU+EcapvDUJwlZ8fDye87J7/8MG2+N2Zo/ODFdcbLo4j12AfIldfHum?= =?utf-8?q?tvQIiOE9TyfUWUuSimd1EfZg2lOQVN6uYdoqS+diZ7FDyZPMqZ30dXBYwiBaBE1DH?= =?utf-8?q?wi5je2OxvHJ4SV8wGZeeM3DhTH48BcjDhZY666XEIfA1DzhrKYMtY9mHP+FYx1tS9?= =?utf-8?q?q+EimcnExrkFCWXgwF5Hv13XfyJHkVNKRSU7VOHoF1uNEQZG+TJ4l6ByTLGWzWlrT?= =?utf-8?q?XyRp54+SMTCV9b4axzb4Y+2cgWdqc/3FSbKJHNA3cXbgyO+EPG7txuhYnKrJ/x8Kn?= =?utf-8?q?6V222DiFscajF57vOHgma4h+3GYPP2gEzM9eBM8i08/hil1Stw02BtD1a5AnWepW2?= =?utf-8?q?8jQiFZoXuQ8yIgVV2SuzRpiSOublYPwV292nL2kuqZ16V8hs/NgEOJrsb3YQ44YH1?= =?utf-8?q?KeiRRfvLnMMLSgnRY7HysCuXhDTv6pe5tw=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)(376014)(52116014)(7416014)(366016)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Mq1wX6JAY4diLKiRqi/3p1gfYVWZ?= =?utf-8?q?6sv2b6DC7v7M23VuYEjdLqBEmsrCxB13YAJd7OigOQr4uG9NMJFgDKJyRfxJMmYyN?= =?utf-8?q?enzSAAWiV5oA9YbDYdQWKTigS5vSvd4D7KEl0/+hKQK6DpBqzKyeXU+b2yam1Oj+t?= =?utf-8?q?JWsA586+0Ku9D3cto5VOYnFr7sJ7WvNOTm0LhNPGz/cmG262ot/w5qkcD32MMWA4E?= =?utf-8?q?/k2QkoC91fxTIpNEvjEaEDTUg/5jGTC95Nhtg3l7Jtz1bo247HPMtPz0fErcRqqyb?= =?utf-8?q?6yaOpTEXS0pU2X7Mrcw/nHr19uS3eH17QO11LolOOb+afc2SKFavHGGUnv06YvRSk?= =?utf-8?q?32DSmS/umr5q5cOoBYQZwA6i4nVbicTKdTA+RaSJXC2lJuawJf7ZTQn8ScCefV1rA?= =?utf-8?q?ZqfVt1Xmtt0foIjVwymBIUcTYFpdRpOB3x9T7UEtbtsOxf2miEqqsk61rV09404rr?= =?utf-8?q?TSIdz0RtqrwDJZvpMKwYPyRa+hp7TDVCNgeopUC42vlLDKC7WD5zxSYGuI/we7xoY?= =?utf-8?q?IxJ/OF63AKyNfvqYE1C3N0T8EuoUvUCSo5m2090wdADqyWjrg4UYWMso5LbPg/2GW?= =?utf-8?q?54Dd7YlJWueFneO4pj47pg8pg5s0KodiQXYVrp7NyQA5CupDjcK05vpFU4B74EDmz?= =?utf-8?q?s6oPbWFxwm5gW2Ifsti0rcOOiH2HhXeKXxCwxMIFQ6owjYskmDL7MyNDln6k6maQ8?= =?utf-8?q?Z+2ZTEKA9g8KvmK+gBMOzlYYGPmnN7w4eyHKSUr5e5tJNRwLz0wghzxo5T7Y4SkEy?= =?utf-8?q?Iqw2ilm+ToaBUE8QRFNyKvZn5xBL/TBvt/vLuMkgPMwN2vqiXoQo5teX5zwubAtt/?= =?utf-8?q?gj7bb+fiDfRaBgjwcvhMJHsLKxryJrooLruDEr7wscOSEgkzP46sH6Nar2e1j0TYG?= =?utf-8?q?KLl+TWbJUqercBuSrEj5OIm5GYYSu7Qtvr+EEe1wE123TBQJC5WLZ/KBvOKHeI1y3?= =?utf-8?q?V7UOdiw22RxJdlIKgWqY6tgWvfgThTiCQVTeyeuE34xIBKSY/fWzX+qO4pu/R6eOT?= =?utf-8?q?N+bADbY10Mhb0/F5JhzhOw7gP5S4fQJy3ZVGLwe5JAZPDiLTJSP1dAF9xsMcAFX9N?= =?utf-8?q?XNvsd9JS9Rp02M434lGu9cKY78zAY4wHhVAqpvcG1ZbI5caVTjqNJl7w63N40VORW?= =?utf-8?q?cY3Su/F/MraFvrTW3GAYMrPN+kzsrQKI+FMVvGktLqOy0z/cE7cyLOClTK7Y0c3ph?= =?utf-8?q?GVmdZbPZ3ReX/kEjn07819oNUZOCpFVDXj87YSB5u5gULZsRzhtFvLCcxU4bS+856?= =?utf-8?q?58wlX+mbOezLAb8D93rpYPxq7AcdNfLnfWAqvTsjWnldXpNJlWoA393HnW/dqs69x?= =?utf-8?q?Yy1564nY/+Fk3oeZDFcAdzOOUz0BIY1YyZhsccuIjHiduMdT5nXMxalDOqOvt4j8j?= =?utf-8?q?XwkdYCeb1ZuBGNEDGGg2/+/XNNppovpeMTF65WeFsYtOXoGXbrVXi/nmVvpJozw2m?= =?utf-8?q?bthjpKH6AOTMZoVAnaaIBSLNNOH0JPHenQjZW9iEOezd15EcavS9JG5k=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79bef7e5-3870-4528-0fb6-08dd601097c8 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 20:17:33.9988 (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: 3no/caYU2jUW9k5Ww9XjWShTOl4ORt5vg1P2FyMNU8TxyTHEtF5ukUIcXBVB02F2OKySS7T62NRukXkdqL8E1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8261 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250310_131737_603891_DE4F1048 X-CRM114-Status: GOOD ( 14.48 ) 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 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 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)