From patchwork Wed Apr 9 13:29:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Poturai X-Patchwork-Id: 14044623 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 9436EC36002 for ; Wed, 9 Apr 2025 13:29:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.944041.1342618 (Exim 4.92) (envelope-from ) id 1u2VUj-0001xg-Iu; Wed, 09 Apr 2025 13:29:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 944041.1342618; Wed, 09 Apr 2025 13:29:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2VUj-0001x9-Ad; Wed, 09 Apr 2025 13:29:33 +0000 Received: by outflank-mailman (input) for mailman id 944041; Wed, 09 Apr 2025 13:29:31 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2VUh-0001T2-R9 for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 13:29:31 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20602.outbound.protection.outlook.com [2a01:111:f403:2612::602]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ab31a413-1546-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 15:29:31 +0200 (CEST) Received: from AS2PR03MB10110.eurprd03.prod.outlook.com (2603:10a6:20b:57a::22) by DB9PR03MB7468.eurprd03.prod.outlook.com (2603:10a6:10:22d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Wed, 9 Apr 2025 13:29:27 +0000 Received: from AS2PR03MB10110.eurprd03.prod.outlook.com ([fe80::52f0:1815:60c9:8873]) by AS2PR03MB10110.eurprd03.prod.outlook.com ([fe80::52f0:1815:60c9:8873%4]) with mapi id 15.20.8606.029; Wed, 9 Apr 2025 13:29:27 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ab31a413-1546-11f0-9eab-5ba50f476ded ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kcCj1DB1oObqtTUJiEstRW6edVxF/ROrdj0Szbku5laLFo9OxVXceszt97NPbWaeFwxj60fsf3FA68GbEa/63xwNaUmM9mQwdF6/DS4EVn4Mxt00kNH7gqbeokwb7UedKr1JFPPDNcOHiAKhnQXk95F4ROW6+GdbUFWsg5nV/br3pIzj95iz4BKDusvR/DJ7dVugUv5ozm3NTLexYRnXpnDmYwTKs4gbMPl/zibLj2UiDsCoyet9nn1abrJgrKjGcGU4fVKslXWJNZ9F7HK0EaW4jCmN9vobutBBcrA1ggpPjvraWm+zhsmEU6HbF7nRbUenmTJ//ZPio4EEFY9DJw== 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=W+i5jbotZlWjB6/+feELzrSWWgwAgHoqmM5jq2AI9Eo=; b=gSw/6M4m9MO80YW3lQyYMoYBKf1jhaL9VcIaaun1y4gO2CahGw1mU7AUi04HSrXycTRKgffwSoGNlNWEAqAtiGiMIz3S/+lRuvh0Hj13na+X/19bhM9/0CwjDK3uxvRL/zSscx8Y5X/IDa1ta111lh7R/IsHsjZ41UhxIxhRx4/m+fa5UkRg1vqcmTPAmGXGAxmcsjw0f9S1z9oYmAI0HnxrQkqRPbOwN/MnczPPyHOWVIUYLmJBJqCKbSNYpKzEYPB04B+gXOXZK3jRU7bbhqFLTVc775T26Ef1ZC54jsXSWgKUJptnIiSm21h5/S824TV8kQzYektuAWsHT9W4kQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W+i5jbotZlWjB6/+feELzrSWWgwAgHoqmM5jq2AI9Eo=; b=vLk3fwExC7GDmaTQohUupxkCG816xC2wS5rXYz7aKpgFwjU3XyEhigEl/dERysMdy83siCAL6RInVKpxO6zdaxrAIApC4vGPz6bHICu+7ibUJTsORAA/Vrl6qZ7lLthkScgbZb/7h5x+T6o3iRd4NnZVe7LpwG6bq6GuAsjeaaF06TD1y6TS6fPhsCDUJEdjYymtqTJJC9dRoNpQoGXc8dnRdmTmIq3D6JtNXxYH3ZpdSrC9DuAEZ3vtkDZGZOkXsLA53JkgJYOAadO7B/KYuXA7n83kFMcIv9FzIiGlTjno0m116VHXf0qHtL5G8RCmA+4Ry+wjUOPfoLC7D293fg== From: Mykyta Poturai To: "xen-devel@lists.xenproject.org" CC: Oleksandr Andrushchenko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Mykyta Poturai Subject: [PATCH v3 2/4] xen/arm: make pci_host_common_probe return the bridge Thread-Topic: [PATCH v3 2/4] xen/arm: make pci_host_common_probe return the bridge Thread-Index: AQHbqVNqJOpNy64us0q429PoDyckxg== Date: Wed, 9 Apr 2025 13:29:27 +0000 Message-ID: <0abee55bcc632ba1be356461e22eca2ceb11dadd.1744203405.git.mykyta_poturai@epam.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AS2PR03MB10110:EE_|DB9PR03MB7468:EE_ x-ms-office365-filtering-correlation-id: b3c3be0a-7090-4b01-bad1-08dd776a8d22 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?gcaYfPFUoYIhZuZZWByt0/Cjsw?= =?iso-8859-1?q?GVD8NmkM6zUtahQ8hFQIXvyeNctcDG8/2Zt2+jt6UySC5v7WV7qQC9Q/D8Qp?= =?iso-8859-1?q?bN5CJbgnz1f5PEe177b+rENXWf1idvBIUeOkQ+D+8RmfUWN3TXPMgvBk3ZHv?= =?iso-8859-1?q?HDaJTIdUIIe9cien5cftJgBXSz6ob4vM1vBWpEJO8gT+q0OfJOIKOlReX686?= =?iso-8859-1?q?WcWfqDG8z2e6pKxFkzWabuMIC8wBmYAOUwN/0+aBIn9zTLRtTph0v5nFOT+T?= =?iso-8859-1?q?89sZLf4pJ3kLiJ6A9V88AQKEmTymo80ZjKuVqP7EVrh7YcreFhD+e0zvjTTv?= =?iso-8859-1?q?0oLVosDjZEPFjL4zOuqOfUuJZMbL1hHoEB4Qs4B9s3w0usCi4mcq5sfn9f3r?= =?iso-8859-1?q?YG7ckGsSQa2u0LU/Uhb9PCUn/OiIsCB7OfDLBvh1HtqG0uxQ+6bffr3qqSo3?= =?iso-8859-1?q?6shEFGDUph/OHRvI2KdsLIQt3lhjP0rK67HsYQkf/LCpawRxU4mrMaB4+6Gq?= =?iso-8859-1?q?61FpBrzJS0MnhB8c++1nxAUBk82FLHrySICNIM5jCEsNhFxitAr62mdhL0VJ?= =?iso-8859-1?q?N20P75Fw+bEh1AjIFKj3AiF9idiAEoKdrdLmgZoiAXiYWjJdiLgtrg7pMfaa?= =?iso-8859-1?q?EmdoQp9q5jkvGKjlAL0Z9ghelQH0wJIHwsXqdfv1GqKFNZt3QOs9mtoi+X7t?= =?iso-8859-1?q?8GVRbbU0t2QwPcGoOGmn+WkXqWeOzBVp7dB1hxZz69Swt0uLYkY8QCgplCp8?= =?iso-8859-1?q?/B57sfBKz1f4sYHvePQ9MgUNE6qMPWr5Q67s6RKNq85WVo2nT4BJdc1g3lUB?= =?iso-8859-1?q?RbD4jDJ+H3LpUDTBlnxA6YOsXzwl3FA/Szv3aEs5IDTtLGymxgyMiJ2nVXzo?= =?iso-8859-1?q?QeKT96H5P9ORnWKZRBoXAbX8fFQaLywwuj+NTWzISJP9bGlDZFU7hN095aQq?= =?iso-8859-1?q?NyYDWROmYb6dESYDBoGqil5+/dqDqvNHhU6+CmacL02an+qybOJDzabYW/YJ?= =?iso-8859-1?q?TNN66n6HKEp8noA25oZhSTuF6ONcJi0GwpXXvBe4Z62sAYzJQMj4gdaor60/?= =?iso-8859-1?q?XdeC5SpuDmOilyLuh0Av2AJ12qzwxM0OPKyXP57aZpBZmzYDzxq2WS1zK9pu?= =?iso-8859-1?q?hwkGOL81+quBXXiYRcRTc1CtgXBDsOBbEBLtqaI2ru9Bi1RcciwSzVNFmAdi?= =?iso-8859-1?q?0h/twcWaIr8KGJ64VBJpcEpUS3CJQ03bJjPlQymKTmqWTPqipXZrzGaskis5?= =?iso-8859-1?q?ilK1kAD8YOTclB8oRF9PkF5quZ5c2qs1MrRFLszJDdvXusJn88W7/Bs0fXIN?= =?iso-8859-1?q?PBwm2mxVMt/0NgrD6+AV7QfwfopOpmu6HwcSAhsOBgkMdgpFpjcYEcy4Oc3P?= =?iso-8859-1?q?vrZejGhZQRNOYZorr+Hn3lQP9KsfiKEpekpo9gFP8h7i4CHtkD/Jy/+87/3H?= =?iso-8859-1?q?1/N7cs6IO/CWbjvIEDgZBwWoForwibLqJ4HH0QI7TBjuFR7GaJHYwS8PAMnW?= =?iso-8859-1?q?bHSEMZ?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS2PR03MB10110.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?lCH+RsoikKdIFEDN+PWR3DM?= =?iso-8859-1?q?VeWEaFvQ5nc8UANTyqs9pcfCMtBONzGAPlQUpweR9Eby3WPyIulSEDa3POoF?= =?iso-8859-1?q?uJd6AoD8syrI1wiPFu3i/soKKv/HZBDvhybfrUdUR/q/SXik6olsfBka5d5a?= =?iso-8859-1?q?L7z7k+giijhSD1ZGXoIbP7f3jyvzcuX5KJcLBdCYoSZzUNYjA+iO3cYj6Uni?= =?iso-8859-1?q?Mkk9j+bFsl733MW2xSjsYVkw3zrgv6Mpfxo9Cn6eu6cjuQuy/CauwcnxMVyr?= =?iso-8859-1?q?Y1IbcI8MNzHUfkHue1t2BO7PM7vf/CcLogs1QLX90VxDIcvjptEvRzY2Jjpg?= =?iso-8859-1?q?HxutnqPAU7EtQynKBZcPmV0zivLS8C/vm5PvzJ++Ho8tojPbpqX/H7KF0KcT?= =?iso-8859-1?q?bms3UQa5fMyiUk/auFloOiRa7L2k3Jaca8F4TQTfJfei6b3TtUUPT2U4M3Iu?= =?iso-8859-1?q?X6fRHlaYO+18j9QOtH0vTpzjVtj+md/3gXLYivnemvJlNLVQlXnPLowTm7TK?= =?iso-8859-1?q?0XexN2ah/pdJliy6iIdfnKSrFQLCM58X6hE3zTXRXxkgu4phmoBGV+qMC9vY?= =?iso-8859-1?q?JViJxxrIgGqzHI5rmcjoOp1PNlMOvvltwVYbvoyNRvUIKUqYplDq/9zpWN5T?= =?iso-8859-1?q?0vho+zxhJAXhD/BpRjFl1VFRz/n+jgE7mwj1bZLCfOXAlfwR7VZxpTgXGfCm?= =?iso-8859-1?q?F2SgsxiGpVL4ADzTILZjwc9B5O/RdCNHwtlXDqWvcud8HaxF5indgUfngzLk?= =?iso-8859-1?q?FzSG+4rINXt18i46hS90ZbzpIrlHzDX13yTums17zSiV/S/+m5WANaXXWW93?= =?iso-8859-1?q?bPfehGUIKLbrdGxsJy3+ajYwrt95b7LIt6mzyV+Tx805/F2FakhBshLaKGpJ?= =?iso-8859-1?q?J4Z92tYAMhX4AWfFYDH4fR9B/SGji3jqBg/c7nkAEg+rD+eW4j6XEFP9Smw9?= =?iso-8859-1?q?ic+wlrAcoBuw7HdmYnkqk2YiNwGkcbJhKE8wxTej9Qt7KFJ7QgDLn5Cuqt21?= =?iso-8859-1?q?UPqOpeMt2/+xVEGEdhRLEmamb0gMrvB/WIv4gJ6oCv/YLzLNxIpWL3/y3H7i?= =?iso-8859-1?q?d3VxE2qLOQoFVfIacUE/wl85txCP2DdypeZ+By5Ufgt6oHKE/lXQb512nlbd?= =?iso-8859-1?q?2RW1D6WoSJoVRDSru4h41nLRh3ehMs+aTLUMqXIeG2EbuXjbCTKiFtquDr16?= =?iso-8859-1?q?hR2Cnq3IPkF9P+6MxJNdjLe36O1L0FXsfz4ei7zCoDErrASGleXvqRUllwcD?= =?iso-8859-1?q?z2HPq3jYO1t9WBSjHJq6rmOo2rtMKCUi4FYWkfhrepFFkDb39b/dqZXZFF/x?= =?iso-8859-1?q?zZO+V8a2zUtBmwu2mece07mTWMyAc6bvRgbvXLcGdQRn0kss2lVrFzJeQRN8?= =?iso-8859-1?q?iZZgUJxZIADD10RigI8GYpA1VtHu4opJJrvGCLji7q8eByIz29bXZsbVLsBH?= =?iso-8859-1?q?mPKiQ/viLQJuknLnUz+iSJfQi8H/el/6etqb5G1Vxq+5SfIpbn8bEWgBBLef?= =?iso-8859-1?q?iXbWx11XG9W/MIoqPi3Yp+Mc9xT0d66rVPUzEtT3AK5b2uKNbkL0ysFhwQbl?= =?iso-8859-1?q?n2HrPcGCvI+Zu/C/u41pD4PxWZqJtkZ0jQEmMLcH9EsgFMc5MHCy3qqFjUj+?= =?iso-8859-1?q?irIw3F7ikNwucuak9p3uvxxfPPaewXibz0cPfmA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AS2PR03MB10110.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3c3be0a-7090-4b01-bad1-08dd776a8d22 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2025 13:29:27.4291 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dwY1R/HjfImts7EWDrsOYuqYJ0AXW9UUcOkkWZv7xv1mshxUO+Hy7IO+hzD5G80wuHupBtrEzu/i/+HEX7A57w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB7468 From: Oleksandr Andrushchenko Some of the PCI host bridges require additional processing during the probe phase. For that they need to access struct bridge of the probed host, so return pointer to the new bridge from pci_host_common_probe. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Mykyta Poturai --- v2->v3: * no change v1->v2: * no change --- xen/arch/arm/include/asm/pci.h | 5 +++-- xen/arch/arm/pci/pci-host-common.c | 10 +++++----- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index a87672d834..3d2ca9b5b0 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -18,6 +18,7 @@ #ifdef CONFIG_HAS_PCI #include +#include #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) @@ -95,8 +96,8 @@ struct pci_ecam_ops { /* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops); +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops); int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, uint32_t reg, uint32_t len, uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf, diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c index c0faf0f436..7ce9675551 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -208,8 +208,8 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev) return domain; } -int pci_host_common_probe(struct dt_device_node *dev, - const struct pci_ecam_ops *ops) +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -221,7 +221,7 @@ int pci_host_common_probe(struct dt_device_node *dev, bridge = pci_alloc_host_bridge(); if ( !bridge ) - return -ENOMEM; + return ERR_PTR(-ENOMEM); /* Parse and map our Configuration Space windows */ cfg = gen_pci_init(dev, ops); @@ -244,12 +244,12 @@ int pci_host_common_probe(struct dt_device_node *dev, bridge->segment = domain; pci_add_host_bridge(bridge); - return 0; + return bridge; err_exit: xfree(bridge); - return err; + return ERR_PTR(err); } /* diff --git a/xen/arch/arm/pci/pci-host-generic.c b/xen/arch/arm/pci/pci-host-generic.c index 46de6e43cc..a6ffbda174 100644 --- a/xen/arch/arm/pci/pci-host-generic.c +++ b/xen/arch/arm/pci/pci-host-generic.c @@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &pci_generic_ecam_ops); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST GENERIC", DEVICE_PCI_HOSTBRIDGE) diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c index 101edb8593..a38f2e019e 100644 --- a/xen/arch/arm/pci/pci-host-zynqmp.c +++ b/xen/arch/arm/pci/pci-host-zynqmp.c @@ -47,7 +47,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] = static int __init pci_host_generic_probe(struct dt_device_node *dev, const void *data) { - return pci_host_common_probe(dev, &nwl_pcie_ops); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE)