From patchwork Tue Mar 11 10:24:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Poturai X-Patchwork-Id: 14011464 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 ECFF7C282EC for ; Tue, 11 Mar 2025 10:25:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907708.1314904 (Exim 4.92) (envelope-from ) id 1trwnL-0004AN-0D; Tue, 11 Mar 2025 10:25:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907708.1314904; Tue, 11 Mar 2025 10:25:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trwnK-0004AG-SF; Tue, 11 Mar 2025 10:25:06 +0000 Received: by outflank-mailman (input) for mailman id 907708; Tue, 11 Mar 2025 10:25:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trwnJ-0004A4-D9 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 10:25:05 +0000 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on20603.outbound.protection.outlook.com [2a01:111:f403:2606::603]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1652e606-fe63-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 11:25:00 +0100 (CET) Received: from PAVPR03MB10102.eurprd03.prod.outlook.com (2603:10a6:102:30d::12) by DU4PR03MB10646.eurprd03.prod.outlook.com (2603:10a6:10:58c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Tue, 11 Mar 2025 10:24:56 +0000 Received: from PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971]) by PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971%3]) with mapi id 15.20.8511.026; Tue, 11 Mar 2025 10:24:56 +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: 1652e606-fe63-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G63J9+9t6DdihOp+Xuavrce8/X0MSm0NjAoNyI7D+nPLvylgSfNMVqaKf6CLoB1cr7luXUkB6RPglfoGUle/ix1B+Ny+8xe8p7blDldFXuqBCRR+G1chbzuvsHFHBBGc7WowaGQ0m4fXqd4TIpd5+IiixC1sgVoSc9vNlLlTL2RJ6cZaoTAsg1HiIat9EYd6r/FFWAm9vXulZ+5WxY/m5CT/44ETB5RNxH/2tezVMHJNHatc8H62Vf08UUp1XeL5JZuWLPKJ4Ze8nBZDp/Ni5Fwd6Pfmc8Hdz+Z2OiputJIYAiKJULqrPeRBF3C1j1Ik0O2NUtbGry8g975vjfDGpg== 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=xtzJ29r2CkN/VA0see5wRUAAmQGRSSS1z7FUujbClKE=; b=JqBVSVkUJTAUoNlW69hVcLxAPP6MuOWzYmw2E4w7HZd8TD8/W4Vz5/bmIP9LvBcTGfRAh+wCDK38LODCfr7GWqrKSSAlvJUIi9FPxe1a1JVpobLUVISxB7AeONAr6/iZwgWN0741qLUPwAuAtL2n5OkzU1Jc33KQ62n2Q+/0Uk6wn2Q90GC2cPtQg33LeKC8dmLf/CSrpbjxGqEtlj5lxiGi03gIxd8D5APyvsF0vNd8+2GGa/QdZJIeLyimp+LfZntibMIJbISk/0ad7iFXLL1y18Se+XmFEt8WsEo4RpFt9GKUmQWljJ2y9In4GzEeJtMq9vkmE3QCMKPLRPTGsA== 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=xtzJ29r2CkN/VA0see5wRUAAmQGRSSS1z7FUujbClKE=; b=Hqhq+L3mLX9qaEgJEk2c5C6LCPooVoAAP2FGnSz6H5U9d4+2/JipZUUcNBr/Lwg3ZdDdK/5gG7h1EQejklMVMEe6AOWGNBcU6GrLsR9Drxy+hgKiK9Itjoycpr6M2Pda6xSFt67kviH+O2mifw0ExOfCa45EgpWudpDP2wTDLKouhQwVZce+z5pTOHRMylCYMiQVbVAqGkxZyKIGQQ19qXyCY5VvK4bacBMTIk9m3/RdAiuIMaLxuJQQgvWYuHLvLxdUAj5FznhyUH/aZuwdVw5DphGM4qw22EbK9aeQI6yLLjDFBqie6iUdlZpN6HtHno3Q5eYu6U7Q0HrEh9Izag== 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 v2 2/7] xen/arm: make pci_host_common_probe return the bridge Thread-Topic: [PATCH v2 2/7] xen/arm: make pci_host_common_probe return the bridge Thread-Index: AQHbkm/Vjo6HzaNfH0a1zt7pMvvptA== Date: Tue, 11 Mar 2025 10:24:55 +0000 Message-ID: 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: PAVPR03MB10102:EE_|DU4PR03MB10646:EE_ x-ms-office365-filtering-correlation-id: a8191275-57c4-4539-69d1-08dd6086f885 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|1800799024|366016|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?OXXcFr48bnDyV7CZjoYIBb5kWk?= =?iso-8859-1?q?tg+oUslvFlJsGYynqvurdkyIp9gZG34JnL4i7+PHy2Fm4UXXLdZbaSrCJnu4?= =?iso-8859-1?q?rMHJk+BOexe0M6NrNGO2glU9bxGlE4TD1TsoXq8fRrTd3n0ugBbvx2UNmNBF?= =?iso-8859-1?q?C65xRNjMvGzE4Ttn/slCCoR/2c1xXTDTJzLLB6NW0GBpA3FIOEoc5WtaM07I?= =?iso-8859-1?q?xVYGWO3TcIxlfh8yqUdV3cMUus+HdkyAzC4VyKEIFaZPeVv+avyWWqSMt8T5?= =?iso-8859-1?q?VjzMzdvfc0QavXdCLbdeYTckp7+8YjP4X5aFdQ2W4MEfAW2y+4DIkLVKXjMk?= =?iso-8859-1?q?4UFtkpMeHzLEzJY8HE4q5R7PM9XakfQm1qLM2epYZP81vL9NWe9yDom0Ouom?= =?iso-8859-1?q?5huGBXN3ESuh5Hnw2nqGXn1s+2g2h+H66ytJuqI/7GEW4KLC2oPQHnl2io/g?= =?iso-8859-1?q?bKAzrwWwvhi1i3J3mwlxM36XbA49aLZYbwutqCy7mgXX7pFy5aKmEjJv8l4T?= =?iso-8859-1?q?q+5RGXig5/ZH6Y3o0sz88fuz6NwTML3CAihnY9Gq28ebQ85dkaMPwJWsyFv1?= =?iso-8859-1?q?fWOKaSxeRzr3paW4p6dvrIer7/Q9ZZabL4d8xoJIIlA2KLWRUa4yE0qRc/aT?= =?iso-8859-1?q?OeDNnkHz4yOx406cxskGUn2GtyNFvLdCJLt+mz9sxz57iOXvaslsuECKDFem?= =?iso-8859-1?q?iSMktQCXk+XmSYSFgQNCMokEpFGD/m2ueM4Yiaw6F+nX94ao6Xs3qQKVPoMc?= =?iso-8859-1?q?5AqtA82hYCAhlDRlE//bdPVfnYDDlX8YzEKGMfYIEXXD83bPgODWEF4gCMgo?= =?iso-8859-1?q?1m24MUD+MXxtQKb+0W93b+eyo6/+1otdC2pmtM4vPbE3UZKiMjMp9lJCY11D?= =?iso-8859-1?q?jol/Din3v6i4ugRCC7AmW6h6socYnSg49JQumhFdWfstwqm3R4+JxBMy4EEK?= =?iso-8859-1?q?mgdzo9IJkeqdWI3Y6LBC6p0ZuvUM7Z65e4oI5hr0F0gh52pA87XCXyt6+xzE?= =?iso-8859-1?q?BiLdRx1I4TM2JO+dbsFGGxM3YLdALXqe7hywpfD+6o7c4Jk1fa/xOVkp28+1?= =?iso-8859-1?q?DPxcgPfmvcyqPxO+vpYVx9l2x0SRpGVFbMbw8PvXf+648bzJV+0OT2EPddeC?= =?iso-8859-1?q?Oo8TwTt0MIC8r3LGk1mG+9Z+M8LMEVvQ81N7WyQClUFUfHMabiWysOmlB1jX?= =?iso-8859-1?q?uzuSLBijYH0srqipi3YKWRmHxm4ozOcjLkHUQB9RI5Ag17DCCE47yCFO7f1D?= =?iso-8859-1?q?IDP9Y9cQxx5v7zFQBFbr+iEFvSGtAzPi7/kFiFlJEPFJcCT3CNi0Qllplc8T?= =?iso-8859-1?q?LdEx8bmvEX6PWqX58a2+jBlEGWpv0IMJ8fUwL3RiU8FxdDEgjNQmlzM7Cyyy?= =?iso-8859-1?q?khLwvAlakh97T5BJ5KMoMtUZ6s2D64LuwCzdfliaIZIcJbOhk4V3ik5xgm/h?= =?iso-8859-1?q?x3/RcQ+QlhS6lgd0OPHJ+Lkx/6ita7wO+Ri/dT3Ct/nQ6qx4K1PD6jyIwnsN?= =?iso-8859-1?q?LMvPgT?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAVPR03MB10102.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?fflOVtU1jj6OE08Vzxt4gOQ?= =?iso-8859-1?q?PHB15FFP3G3wPt+ohFwPzVD+5GJN14Fqpe60x0o3GHZzooZnklyxdEWyZcs7?= =?iso-8859-1?q?WWN1aYm7H+nwUrVTccyVuTeegdNJ5StiIr2XQB/dx5E8IvU1yzI1zHsMN6CM?= =?iso-8859-1?q?Q7s5ZA5EblciaOYcGBNVlC127jLpc8ahaIJQA1N9wQPiuSfZ3peoox8crwIY?= =?iso-8859-1?q?xyRPfzHH7EpGGZzc27+jT0IZMbM0o4TsKhkMX/zMUufqthPLVXenYK2DB6z1?= =?iso-8859-1?q?GljWIsQyfjo2dGETAqLc24Evx9ahQE0WsdMpD+rfmqVour5OIRxswhiS7sDx?= =?iso-8859-1?q?ljueLY7nxxIB3F+AwptwFVGAGOkWNMwnhaN3DlrREVYn15Bts6mJ4cGv7eNr?= =?iso-8859-1?q?Tlaab6MqjGsckMqftBg5m/isDSPP+n4l/YKAsZtZ9MBjXFDmeIbdCxjSQ145?= =?iso-8859-1?q?bI+AgGFCrhxh9suTbjOeTzkvnMxf66P144l3fBYJemFecgSzaNj4gDllNNQY?= =?iso-8859-1?q?nK0DjverYUsLOodQBnCshJJHRuBCqAWo1qi+yVowwgIWbV/nIomU2+XZJFO2?= =?iso-8859-1?q?c6M2EA9tNvjJqawqky5MRmPkKSvJwf/uxz9uGzGLwS7o+JCQQhi1LAVqGD6N?= =?iso-8859-1?q?/YpuwQ6StORn8cDajm2BQ6aN+2IkVDF6niiFMbmIMJ5rcSmC+xV5T3MarOQQ?= =?iso-8859-1?q?55V7QgJ3PPzowsUiRPS69x4u3Sacfe8Eisvpx6AojRKdXIIjTZX0qK3TiWtG?= =?iso-8859-1?q?DIMserMw9JsVL3kSmQeQMU/LCNYBYgWEiRX+10rT5111wkaytjAAo9XhrsPe?= =?iso-8859-1?q?9So1i65WXFgjnYM7rlXEM5kQMBLO5egVOqp3uK1+9wwWcsCMHgvuJyq79iad?= =?iso-8859-1?q?W/zwS09FuW30bBE7CGVX/Veb554yChHIRhI3TgNytYb2WcI70iuKhHirDftP?= =?iso-8859-1?q?0i7Hod+I0T6MhmuZjJNpdHctytiRn9pYA0pI9XGICvpYRrtgQb5FKSKziGcd?= =?iso-8859-1?q?FHH+6U9SkHRWZm/Orx1l2PcLT7WwvLycKkMxSlx2B8rq07XY+hL95Qnsyx01?= =?iso-8859-1?q?jebZG5Mo8ALzAB+javDaHspCKovW0oseV3iOujngNQWGrSfX/aKdYcsM3X10?= =?iso-8859-1?q?9fBH9rwPMojrnsn+PiShKPvq2Q5TYtBAiG+IAyK5I986qbgApn6Yx+AmNuy/?= =?iso-8859-1?q?zpFB7848Ve584p7dp6lPbl43dbcs0/up+3XuauQeEGVacB4tBjgOUOxdDYem?= =?iso-8859-1?q?MOhmequt2ZLfXQjpmAGjORrF76vqqNTNhuWXwy7hvMxmtPVFzsgS3VcWnZeb?= =?iso-8859-1?q?qyx6wVrxkRDbUDX2dfJsPsSETZOM4E/6Z1lyXsfBC40w8yxdGq9T7P9XF58m?= =?iso-8859-1?q?qUZJbhNVQkmlU84A0nf+QkuxTcPOkOyAO32AXx8mXVJwmzzq+JlL05cHmLwz?= =?iso-8859-1?q?gKNs91x0ssZ4RiYSxvZTnFDtMG5UzyqlFA9I9UkkpRh2nfRIsFeGxH5Ak4td?= =?iso-8859-1?q?K6w+HXYoOVTofFpC3YHA4OAYu7bVqojazvsVNCDBxEtwk2Zlkn48IqPI8YHt?= =?iso-8859-1?q?BOS7jQCQFAljY2N2h+lf16irjyIDJ/yLBd0cGFwfjRmGmrANy/TjsX3xRqtY?= =?iso-8859-1?q?S9+cBInQOiQ7QfjtMA5ham14rOLOvHIsQwPeurQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR03MB10102.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8191275-57c4-4539-69d1-08dd6086f885 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2025 10:24:55.8291 (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: fhp1KUU9SZajaVQ+MFZ+uGJ/H/5x8PvoVL9WVaaYJkMFZ6ucElyU4MXWUc46lluRJmwWBYfuqYByMcnQKd+05Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR03MB10646 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 --- v1->v2: * no change --- xen/arch/arm/include/asm/pci.h | 8 +++++--- xen/arch/arm/pci/pci-host-common.c | 12 ++++++------ xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/include/asm/pci.h b/xen/arch/arm/include/asm/pci.h index 44344ac8c1..e1f63d75e3 100644 --- a/xen/arch/arm/include/asm/pci.h +++ b/xen/arch/arm/include/asm/pci.h @@ -17,6 +17,8 @@ #ifdef CONFIG_HAS_PCI +#include + #include #define pci_to_dev(pcidev) (&(pcidev)->arch.dev) @@ -95,9 +97,9 @@ 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, - size_t priv_sz); +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + size_t priv_sz); 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 be7e6c3510..e4e05d1176 100644 --- a/xen/arch/arm/pci/pci-host-common.c +++ b/xen/arch/arm/pci/pci-host-common.c @@ -208,9 +208,9 @@ 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, - size_t priv_sz) +struct pci_host_bridge *pci_host_common_probe(struct dt_device_node *dev, + const struct pci_ecam_ops *ops, + size_t priv_sz) { struct pci_host_bridge *bridge; struct pci_config_window *cfg; @@ -222,7 +222,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); @@ -257,7 +257,7 @@ int pci_host_common_probe(struct dt_device_node *dev, pci_add_host_bridge(bridge); - return 0; + return bridge; err_priv: xfree(bridge->priv); @@ -265,7 +265,7 @@ err_priv: 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 cc4bc70684..dde6a79a8e 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, 0); + return PTR_RET(pci_host_common_probe(dev, &pci_generic_ecam_ops, 0)); } 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 985a43c516..c796447ac4 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, 0); + return PTR_RET(pci_host_common_probe(dev, &nwl_pcie_ops, 0)); } DT_DEVICE_START(pci_gen, "PCI HOST ZYNQMP", DEVICE_PCI_HOSTBRIDGE)