From nobody Tue May 7 11:27:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=oss.nxp.com); dmarc=fail(p=none dis=none) header.from=oss.nxp.com ARC-Seal: i=2; a=rsa-sha256; t=1678378838; cv=pass; d=zohomail.com; s=zohoarc; b=WsJr6Fy4zyPSH2Jjg+CQySS0jVQ8sG/G62at9w5O2kaesH/urFJtaI8U9bOBfwJmxBXZijRwl98RtFC7tAN2cjDCyaz4IjHa9xCCpn4ncOfwAKuRw3NSMiVHFF0MKM/4V+roZd5ERt9Xp+J3W+GLgBbt5d99sn+4O6QfBSWDcJ0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678378838; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uQNYeJoSq7Q9ZqnSKcAT7DwtkzmkKIujQqNfvAuqlr0=; b=h0McArUFq42U74VQvF4aw2V3AxjPw+VhpcG0nTNU6ZKsHMcT0kbexY7vCwHBNmt4/ofGiJDArCFpM69Nv69KlMjYGEJhQtJ48R4CHgaoDlses7QaI5sO9SrfoVC9XwnwIDHG9EWL9h4bB+VAdkMv8b9NL2rCTpfsh6vmPPEr5R0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=oss.nxp.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 167837883784912.208606958568339; Thu, 9 Mar 2023 08:20:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508328.782921 (Exim 4.92) (envelope-from ) id 1paIzv-0005c0-Dz; Thu, 09 Mar 2023 16:20:07 +0000 Received: by outflank-mailman (output) from mailman id 508328.782921; Thu, 09 Mar 2023 16:20:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1paIzv-0005br-Ai; Thu, 09 Mar 2023 16:20:07 +0000 Received: by outflank-mailman (input) for mailman id 508328; Thu, 09 Mar 2023 16:20:06 +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 1paIzt-0004YB-Ui for xen-devel@lists.xenproject.org; Thu, 09 Mar 2023 16:20:06 +0000 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on20628.outbound.protection.outlook.com [2a01:111:f400:fe16::628]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4018f434-be96-11ed-87f5-c1b5be75604c; Thu, 09 Mar 2023 17:20:05 +0100 (CET) Received: from VI1PR04MB5056.eurprd04.prod.outlook.com (2603:10a6:803:5a::13) by AM9PR04MB7667.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.19; Thu, 9 Mar 2023 16:20:02 +0000 Received: from VI1PR04MB5056.eurprd04.prod.outlook.com ([fe80::f883:bd6d:18d4:c487]) by VI1PR04MB5056.eurprd04.prod.outlook.com ([fe80::f883:bd6d:18d4:c487%4]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 16:20:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 4018f434-be96-11ed-87f5-c1b5be75604c ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NSgY9SjtE7MbRUG3P7gNlSXUK7GQ7nLtc/EZ8VSdH1w5Q5t7ysJTakLWjYxzTS5+gvIMpCogd9l3UWaJbKKeHgTehplAcRJW5QNQPGKjVj23pC8So+zFB68FDhhDTwea4Vxxewbw/C9qtvWmkgQEEoj5b0cnrYCfbwGV10JiJz0vtZ8808YDSxYsoUY2wExNe/M8uRcIaN59UOuiiQRv8oyBS1Zv42ta3qYWRmqyGaxI2vy/g6o6oYAKmYGxqTZ4SKB+GjZGkqVnfsUR4rBRonKLB5ZKrCVmRtd02l8ZJFfqT42RRBlx/AE5tuWVHzBUkF6u3u6M37c9Hh9pg+InuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=uQNYeJoSq7Q9ZqnSKcAT7DwtkzmkKIujQqNfvAuqlr0=; b=Dyg7i8umN99wdedUkRE5e3dyD69PlDuMG0Hh67Nm0Moc9UdqrOGPfR85JsZ9p/91aIihgAD8AV7ZUCH7o6gekCJnL60ClzYjqWnYGxIrpix9YPmdRsWfhV4WufYmF3+QQlUGKuIg8oYbjFiqHDLqwe4QE6o71KM+/uXqNTGmVIaL7jpL6EGl9KEJFR4jH4UmyOtytwuGJ+h7KyKJ3jqb5UGEjF2oTj8MV58ZOlAdgGZRbZrHoZl15NDQ5Ji5MzQOD2h3VP2jrzMCjP3kmZTquyPZzaYiNmEVif4cSeeZgOjcrdITgmTqe/DFvHPa6saxhj6onyV9L8mXOKgbw3O0XA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uQNYeJoSq7Q9ZqnSKcAT7DwtkzmkKIujQqNfvAuqlr0=; b=fU0NGVSXiJ1P7tbZxoYMfn67bABKnvWziFXjNkrO1JYJGVNmw5FB2gyNSnDLR/bas+4zKQx6odUDMzrIPpkTrwbMp9eXWe4mJQ6Cgdgge38hiR4nIROCTViK3KjQpZYGNxd7GrelLmTxw1iX8sLuhpFRA9l3EoNO5mq3hgRp8ZE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; From: "Andrei Cherechesu (OSS)" To: xen-devel@lists.xenproject.org Cc: Bertrand.Marquis@arm.com, sstabellini@kernel.org, julien@xen.org, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, Andrei Cherechesu , Bertrand Marquis Subject: [PATCH v2 1/2] arch/arm: irq: Add platform_get_irq_byname() implementation Date: Thu, 9 Mar 2023 18:19:32 +0200 Message-Id: <20230309161933.1336367-2-andrei.cherechesu@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230309161933.1336367-1-andrei.cherechesu@oss.nxp.com> References: <20230309161933.1336367-1-andrei.cherechesu@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0138.eurprd02.prod.outlook.com (2603:10a6:20b:28c::35) To VI1PR04MB5056.eurprd04.prod.outlook.com (2603:10a6:803:5a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5056:EE_|AM9PR04MB7667:EE_ X-MS-Office365-Filtering-Correlation-Id: 369c9141-dcdd-447f-8e32-08db20ba2239 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YXlPzAvoipRdxPghJFetJ3SvPPigtGrS3oOVsZt/uLcb+uieUuwt3tXr+kEMzXOYujqXKstYtCjVl7AD9Wb66I6iKr/xBJXkPehk+hu2mDSes8Kydpbbn6Vs0X4TiPSl0Oyg72VMxcd9mTq+WLCJSPpEgl2LMfQX/UD8T4JH57dZ5XBGFaU7PUVpMmMPjzyZKNpw8yU9s8NyK4KeCk5WIj2ZxNAWKfYCE8y3/2Oz+NxENcSfyNvjX+/zxwKF3jST5/d4IbRrDo6uEvk0znTdlLQ9faZYI2UIrAoU77ttXm227ihavm6NrlFQs48MsJuuHbcp3I1tph/JbMiNOtu2hZuFcOeHXQCx3BluumEykW0xQV9gBQMoNxzHuprx2GXOQHG+9y/mnJ0QY34DstzH9TwVzdnDjrhvB2qr8AB4YOJcy3Bn67iECgoyqKztcn6sMISiOIfaUZnx1rYTGhiI4pQCfw15DG2B7GAaSMUWgBz/NCzG/Ar7Tt6r6cupCaADBqX/nhyAdzbtP8cmuHv3KRzCA1FBuqm7AwMFs5wqXGZjdAq03Hrh6I7TJ4QrjoARtwqcxhKyTBhvbhVURCGFMr4Q2u2JT1BsM/4AIJiqgET0ZSiReXYuY+hdcOJT4Fo8oIJ6XFMG/YTDPSigr3sycz1mq4x6Ymv6rlzlN5Y003O081Idq+de4AcuDakPsECSDdoN+nMInpR2PGlBVVQzXg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5056.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(346002)(376002)(136003)(396003)(366004)(39860400002)(451199018)(86362001)(316002)(54906003)(52116002)(478600001)(6486002)(2906002)(8936002)(5660300002)(4326008)(6916009)(66946007)(8676002)(66476007)(66556008)(41300700001)(1076003)(38100700002)(38350700002)(186003)(2616005)(6666004)(6506007)(26005)(6512007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DdktHC6EEgaLZkw/SrG9y9Q1Bi51YZ2RB2uHIe+vc6ONuqtwCOv8oaic3NN4?= =?us-ascii?Q?0ECOLKxjQ3veM8hEgah6Kn/gclcX40ORH89R64tz6u0nBsbdPFcrOeQy2NBw?= =?us-ascii?Q?1anLrA/Ma/XwheFwSFe/5hdRxKx0KlZe63ok/bwUMeyGiRLnF9ecc5YVJ7ik?= =?us-ascii?Q?klrdtx3zzd7uTu+yPtnbHgjGUovR77fy3FsG4gBqC52HezYs78u6sOV1wZbX?= =?us-ascii?Q?kUNBBImgxnlNojBBvvIMPuw2Qey04h4gEv31wxpeGmT0q+O4rQAh/04aEQx/?= =?us-ascii?Q?lA69hINPO9M8SYbxMcu1mD7GSr0a7uaGIv16kz5qt9ZcohPlSuPnGnvKrU+V?= =?us-ascii?Q?fRykbLukfZJdwbKl7KR4hhxecfkPi8ZiqAQV7XaXbdN2NSQntWqU2jF+Ayco?= =?us-ascii?Q?H1hlShvSPzLpJYO5+iArAuh2JtsevGNLTUyBRUmrynem/oyadEDaqZxyvErm?= =?us-ascii?Q?ErUg9i4cHsIAqf9M7K7uWEED5Z0uewpOfquipMlMQ9aW7OUAkpvP95IoNe6W?= =?us-ascii?Q?NZ9aiHvmfyN3SbVMa5ak6b1yEWD39M+q14H7fyD3/Urmx39YFIBBdEbzikdS?= =?us-ascii?Q?PycP1TFJ0jy2QlVqNGrn5ZQKbybYql6Xv4UPqTh+N4btCDQCvd5nk1bruyqD?= =?us-ascii?Q?eYj0u90idk9lf/ctPtY+Sn+gamhLYTp1gEkfMQHQwtN4zS6dG06sFTZ0eDdK?= =?us-ascii?Q?UNM82RTykL8mOH0uTNypYKD6hhOA5X2NwKxdijChgroGWKmtgE5sHJIzzPVm?= =?us-ascii?Q?ZCgZCzqBB3H6nzahQeAzhrGOEcNSGoksgDUhm3EUs0iJavgaGLmu8aG4opcn?= =?us-ascii?Q?qn81vKCl7TaGbL1eOF6dOnDTu+2442uVZf0cMjFzFi1O8xkCUBnXlUUx3hTE?= =?us-ascii?Q?i8A+mKILM4mL6uYYnczk5gM8h+6a4nc1ObqyVIk6GCZzGLE71YIedQRQnUuc?= =?us-ascii?Q?N0o0ux5i1tSLqmxT+z26DoiU81qo/T+nwF+QL5KrbLmgWaPrnzAzl9Szjwxs?= =?us-ascii?Q?i2AdscSyzGWT41Wnl2taV+G9yjw8GazpDp5zIn+pmGlbJRXe1DfP/+xU20Yr?= =?us-ascii?Q?5rCAhqjRthN7DFJVUpiz3TZx04zEiI4M8VOEVapMbjEVC9VAzrnxCpaPPdzY?= =?us-ascii?Q?KUm50gZJB966MTT12CArU5Qy1mO8I6iLurePQgbwn9N8nJpUTTtZD544V8Ae?= =?us-ascii?Q?DSKSmz7F/BLJXmqqKFeW8/g8jzK4TxfRufsQOLoDOhq0N8Zi5TtoqZ8IElot?= =?us-ascii?Q?wJOkSDAP1/xyX5GLCmQZK/KHTW/1gj0b/mUOtgCXxN48wRhWvKrGccI+5x27?= =?us-ascii?Q?jdjcfL3cfleT7ZHJfhKo9NYZGYVHGtc22Z1UfoOa2j1NHq+W67lX2EtsiH0k?= =?us-ascii?Q?ILCbIn5BphcmovmbysD4t0jQKV8InvWPdp2m/7bUfxjbHFPbFWwrC1Abv3r0?= =?us-ascii?Q?vVAnWa5G1mmZPaH++ZVhq/5QKDn1A82BekAOF1vLSHVQwfgXns3ZnE7I5eZ7?= =?us-ascii?Q?sqw2GCwQCTH4f0MMuRePkz3LnfQCr3sk/dcKWksaPzVk5DoLHRcWLlNhgVHt?= =?us-ascii?Q?TYMk5P2x6HZfd1wsqihbMSd0bY2AjLDscUKZWvFv77nCHrsoo4dsbnTQfOvD?= =?us-ascii?Q?1Q=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 369c9141-dcdd-447f-8e32-08db20ba2239 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5056.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 16:20:02.7634 (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: mpHaSp42uvqVjcX6SOwlu5lhiU923kvT0cqURQH3Gc2X87mciN7TomXT4SZ6Sd0Oz1NnY8/x2aKiaIlg7m3PI6XCdCA+cZZjgJagSS7oHeg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7667 X-ZohoMail-DKIM: pass (identity @NXP1.onmicrosoft.com) X-ZM-MESSAGEID: 1678378839998100002 Content-Type: text/plain; charset="utf-8" From: Andrei Cherechesu Moved implementation for the function which parses the IRQs of a DT node by the "interrupt-names" property from the SMMU-v3 driver to the IRQ core code and made it non-static to be used as helper. Also changed it to receive a "struct dt_device_node*" as parameter, like its counterpart, platform_get_irq(). Updated its usage inside the SMMU-v3 driver accordingly. Signed-off-by: Andrei Cherechesu Reviewed-by: Bertrand Marquis --- xen/arch/arm/include/asm/irq.h | 2 ++ xen/arch/arm/irq.c | 14 +++++++++++ xen/drivers/passthrough/arm/smmu-v3.c | 35 +++++---------------------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/xen/arch/arm/include/asm/irq.h b/xen/arch/arm/include/asm/irq.h index 245f49dcba..af94f41994 100644 --- a/xen/arch/arm/include/asm/irq.h +++ b/xen/arch/arm/include/asm/irq.h @@ -89,6 +89,8 @@ int irq_set_type(unsigned int irq, unsigned int type); =20 int platform_get_irq(const struct dt_device_node *device, int index); =20 +int platform_get_irq_byname(struct dt_device_node *np, const char *name); + void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask); =20 /* diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 79718f68e7..ded495792b 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -718,6 +718,20 @@ int platform_get_irq(const struct dt_device_node *devi= ce, int index) return irq; } =20 +int platform_get_irq_byname(struct dt_device_node *np, const char *name) +{ + int index; + + if ( unlikely(!name) ) + return -EINVAL; + + index =3D dt_property_match_string(np, "interrupt-names", name); + if ( index < 0 ) + return index; + + return platform_get_irq(np, index); +} + /* * Local variables: * mode: C diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthroug= h/arm/smmu-v3.c index d58c5cd0bf..bfdb62b395 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -200,30 +200,6 @@ static inline void dev_iommu_priv_set(struct device *d= ev, void *priv) fwspec->iommu_priv =3D priv; } =20 -static int platform_get_irq_byname_optional(struct device *dev, - const char *name) -{ - int index, ret; - struct dt_device_node *np =3D dev_to_dt(dev); - - if (unlikely(!name)) - return -EINVAL; - - index =3D dt_property_match_string(np, "interrupt-names", name); - if (index < 0) { - dev_info(dev, "IRQ %s not found\n", name); - return index; - } - - ret =3D platform_get_irq(np, index); - if (ret < 0) { - dev_err(dev, "failed to get irq index %d\n", index); - return -ENODEV; - } - - return ret; -} - /* Start of Linux SMMUv3 code */ static bool disable_bypass =3D 1; =20 @@ -2434,6 +2410,7 @@ static int arm_smmu_device_probe(struct platform_devi= ce *pdev) int irq, ret; paddr_t ioaddr, iosize; struct arm_smmu_device *smmu; + struct dt_device_node *np =3D dev_to_dt(pdev); =20 smmu =3D xzalloc(struct arm_smmu_device); if (!smmu) @@ -2451,7 +2428,7 @@ static int arm_smmu_device_probe(struct platform_devi= ce *pdev) } =20 /* Base address */ - ret =3D dt_device_get_address(dev_to_dt(pdev), 0, &ioaddr, &iosize); + ret =3D dt_device_get_address(np, 0, &ioaddr, &iosize); if (ret) goto out_free_smmu; =20 @@ -2484,19 +2461,19 @@ static int arm_smmu_device_probe(struct platform_de= vice *pdev) =20 /* Interrupt lines */ =20 - irq =3D platform_get_irq_byname_optional(pdev, "combined"); + irq =3D platform_get_irq_byname(np, "combined"); if (irq > 0) smmu->combined_irq =3D irq; else { - irq =3D platform_get_irq_byname_optional(pdev, "eventq"); + irq =3D platform_get_irq_byname(np, "eventq"); if (irq > 0) smmu->evtq.q.irq =3D irq; =20 - irq =3D platform_get_irq_byname_optional(pdev, "priq"); + irq =3D platform_get_irq_byname(np, "priq"); if (irq > 0) smmu->priq.q.irq =3D irq; =20 - irq =3D platform_get_irq_byname_optional(pdev, "gerror"); + irq =3D platform_get_irq_byname(np, "gerror"); if (irq > 0) smmu->gerr_irq =3D irq; } --=20 2.35.1 From nobody Tue May 7 11:27:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=oss.nxp.com); dmarc=fail(p=none dis=none) header.from=oss.nxp.com ARC-Seal: i=2; a=rsa-sha256; t=1678378838; cv=pass; d=zohomail.com; s=zohoarc; b=NXNASNDrAwhqU7YjUQDYxzrcvXCIKT/YW7AOSfeIDyY6QZ4KjnYLsFGHFCTT7AurEuOqtMxbH6MwrBzYGVW+oYPRnY9lnvduUxs4CUwvVmP05bhmMYvUhediVTmEwjxvtYR49Ewbkkarl329z2Uie8OpsF02poO4ptxV0iKEbK8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678378838; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=33kYFep1zFWkBTd1y0DHwVF7+6Ut2vL8LuyGt2ggwL0=; b=SIF5QCgf2wlcvoJ1K4LR2G6HmalaJbHUVxhsC5wprFLi1100d52tcaEhfhwal/DlOhSWJxlgIH2u/+AVCu+Wp67x+ij+RbGazoLlbnJVQPZERbAojRdjNK3vsD4u5/rwLKPVru+EGXsoKmPHR6dOlBHkvPxdlqD+MmoWZmQHxZg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=oss.nxp.com); dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1678378838810325.6403693441589; Thu, 9 Mar 2023 08:20:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.508329.782931 (Exim 4.92) (envelope-from ) id 1paJ00-0005uX-Nh; Thu, 09 Mar 2023 16:20:12 +0000 Received: by outflank-mailman (output) from mailman id 508329.782931; Thu, 09 Mar 2023 16:20:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1paJ00-0005uQ-KI; Thu, 09 Mar 2023 16:20:12 +0000 Received: by outflank-mailman (input) for mailman id 508329; Thu, 09 Mar 2023 16:20:10 +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 1paIzy-0005sx-TI for xen-devel@lists.xenproject.org; Thu, 09 Mar 2023 16:20:10 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20609.outbound.protection.outlook.com [2a01:111:f400:7d00::609]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 41b99e2a-be96-11ed-956e-85ef70e17bfa; Thu, 09 Mar 2023 17:20:08 +0100 (CET) Received: from VI1PR04MB5056.eurprd04.prod.outlook.com (2603:10a6:803:5a::13) by PA4PR04MB7870.eurprd04.prod.outlook.com (2603:10a6:102:b8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Thu, 9 Mar 2023 16:20:05 +0000 Received: from VI1PR04MB5056.eurprd04.prod.outlook.com ([fe80::f883:bd6d:18d4:c487]) by VI1PR04MB5056.eurprd04.prod.outlook.com ([fe80::f883:bd6d:18d4:c487%4]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 16:20:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 41b99e2a-be96-11ed-956e-85ef70e17bfa ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HrZOoXEUpeadc+MxdpPX4i0S2VlCzv1WaC0ehIXykYrlRXMqNtiN6A7PAHXSc5Kj5Zjfxjpk3IcU48DpaoT4Rh/WIm7KL5649ezEGfH2ljZhPP/Sh+ilHflVpLvYpdzZGHz8wahz5qgj5s2Qt6njMkHiuYXYbCTg9bICcznLiXrRc2j2viSiKrftsKPGJ5K0IAQ3J17f7DpRSizc1v3aTDlLGYQ8pB/JN5r9uFF5Ccj+gmoPEHNfXjE9mzQSbNxRFPDFNN3SKyTnoHdy8XPGlBVFSzbtpMLQMosAXGnKkHUkEDskE9YcKHLTb1IZM4us0gK2ErgQc9u1csG7O9fTaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=33kYFep1zFWkBTd1y0DHwVF7+6Ut2vL8LuyGt2ggwL0=; b=nq9eWlQcnrti/AlvRsuYOZj3qfroZwE7Jc03Z9UMPDQeJxgwEGjTVnXVF7X72nbPNcOUIpKhn3M3LA3w9T54Ed7behGUa4pgDkMATZTxthrD6AZEi7lameCKvIl0iQVjtPoJdrzaEFjxGG62mxuVqROyq47YQjKk6U7cfWRdxxYA9LQzoEmuQ1DtReThYo1321VSs65XjZvozR7Elm/Wr38C/rz9M/mjVODDT9dOxg1Tn3mbfeR2g7VMiiYpVYuv/kKmbSFQ0omPj1qZf5Z8Rc5lJW7JQOZz7rQUxqEqO/RyhG/n3aEevxkkban9AfiVr3XGeqHRSjmMrfSFZ+mOXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=33kYFep1zFWkBTd1y0DHwVF7+6Ut2vL8LuyGt2ggwL0=; b=BXGh9WPqMwF4EQCZ3avYRg6UeI1fpkwaWdG35VKFmgY5rsrhsp18C7mbHWg3qDVGqmFvZVrecTXuo21uzKN0V2wsMm4+FtJ8SeeQp7O6mnFtG60/G6C4uBCMKdpgMSOI1abwjUXhsXa/YpHbW33vv7zvfuMSS3laZlC/0MTEAuQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; From: "Andrei Cherechesu (OSS)" To: xen-devel@lists.xenproject.org Cc: Bertrand.Marquis@arm.com, sstabellini@kernel.org, julien@xen.org, Volodymyr_Babchuk@epam.com, rahul.singh@arm.com, Andrei Cherechesu Subject: [PATCH v2 2/2] arch/arm: time: Add support for parsing interrupts by names Date: Thu, 9 Mar 2023 18:19:33 +0200 Message-Id: <20230309161933.1336367-3-andrei.cherechesu@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230309161933.1336367-1-andrei.cherechesu@oss.nxp.com> References: <20230309161933.1336367-1-andrei.cherechesu@oss.nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0138.eurprd02.prod.outlook.com (2603:10a6:20b:28c::35) To VI1PR04MB5056.eurprd04.prod.outlook.com (2603:10a6:803:5a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR04MB5056:EE_|PA4PR04MB7870:EE_ X-MS-Office365-Filtering-Correlation-Id: 633a262b-1374-4a29-6788-08db20ba2486 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i8qal8hsbQTb1ri1eDCbhOrjpVfjqd7pY8YEow8lUywo2uUNpOR3GON67UwycPHCvM7DlLovc3GfEmcB4iC6Mh0q3OxxYw+JOExOt2oINjgmDDUj5n0O9zu3ZSYWL7SqzVj2dYP8M7NWDQA0j4/hka6IXx9ZxRpTChDdt5glnIxC4qhEVXRfnLY2gzcifH1vkCvFgGA3ennnYJ/+k8X02V9XIVVwOxaYb26wCXYo6O4UwNK9BQv/Q1EToX540sWr8GxIXDB01z+CoKP1MgYyhcJVo4DUl3YR8VMhWx7sbWEHxOqEI+y5vtALJOAsSjyBxPjztLY2QzmkKLXaAsa2h7jAs6Xp8QyZpMcXfY/EYiRi+owqBPt2bAI/fXdlMPzCyNrNQl799eus6ArBN3iTjDIek2g1CegMbmLhJKRa52STAMXqRp8pho5jEY6Befwe3lXZe0rrx11cGkWgkPl9CUsumqnDKVvqRPhfPKOwbQftJNbYrBHDT73EhEfh9xNptcFyPkM4h/8eBVF1eTPuGcHqWHQbx/p+999nRRSmdYQg1obkvsdmh9C019zt1SfAVUegjBD1UZaFw6SZRgccAr/+a/jot1AEJCp52zi41ckqj0vgIr+rbM3U6bc0YVotnBb2qp7jWdTH/5E1BM9EKLr7GiJNu6hdvaqkFy8OWUSqLAf3v9kRBFGjDD2fK55P X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5056.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(396003)(366004)(376002)(136003)(346002)(39860400002)(451199018)(8936002)(5660300002)(26005)(1076003)(6506007)(38350700002)(6666004)(38100700002)(83380400001)(186003)(2616005)(66476007)(86362001)(41300700001)(316002)(6916009)(4326008)(66556008)(66946007)(6486002)(6512007)(478600001)(52116002)(8676002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VLTehb24milUjHAjuohJWcwntfwxVHTp6RffmP4/UPAEJ5imhXHuDLkVaCBp?= =?us-ascii?Q?1t5Yp0rdLl1bUBQFbGlrj+tpqzy7QMUs5tXmP0lmDqiklxon6zHdH6i/T8ky?= =?us-ascii?Q?9iRnSJ6pVG9BocCT3kpbxWrKoXnpfOapxL8f3AWt/diaCIeHVwzbb6oqS2+C?= =?us-ascii?Q?xRsPi8Sm61ODU1EvLu0yke0/cy921aeQOHfWp6/iDc05LS8s52Fv3Tf08r7i?= =?us-ascii?Q?bB1Dsv+6k1SL2S5UriRQDWltTrR/lkR29Pmx+tVcMZ7ArZVoQFq+ucG8/cui?= =?us-ascii?Q?DqqYzsIqcKBgEizOO5fH/yKerflKLjqOfcV/q6mwGYEq3YUAZEDZhfbk58/s?= =?us-ascii?Q?50dI41SuHh6m/ieyAedXWLBwilAW+HsN2nsA2R/VurmZSPkWPNoczVAD86Hp?= =?us-ascii?Q?cbMEIU4MqcDDbIHDgKlksLI+xz+eM7CYJ4e/DbFNbqgJeKpKVYxonvFMii8V?= =?us-ascii?Q?bZai6DqUMoTr7HKr2Yo10nvaZ4fQrYhfZ1m0TV7thxRZs6pqu3EtELGJpVjg?= =?us-ascii?Q?+hpEJ5m7VU7GrzzeA7rbW8F4CvSxL52vk5/DrxKU86L7IDtIq009FndbcWoV?= =?us-ascii?Q?eqSY2roTbW11onzDxn8iS9EHYPMUPgwAio7M9t/A2O8861RnBp7g/06k5oLG?= =?us-ascii?Q?W8VEaYhc64Pq+YdjgEWXBTkChwWWooQzQ4/b1WSuM1ziQuu4/SbvOtRCRpWa?= =?us-ascii?Q?/Gz+6k7ltxyWVnJ3vE3hl/BOB9SDJxb3w15pwGM9uDCoesVg1oCbkUYwVtNe?= =?us-ascii?Q?HOcV6X0v8yV5Qn0uyYQbVtdu24oY3SQSVAhX2aqnPpXTze3Pq4AQXNEQatkj?= =?us-ascii?Q?lyLtTrDdcmPqE6YIoYsamk2b2/jysdu8t380rOrY+0+3s/gl57bPVCJHzDmS?= =?us-ascii?Q?ME1O1Jun2RL6fgKBYujF65VBmMxHhiYL+X4cBRLvOmI7u/tNCkRPJR3KbVYD?= =?us-ascii?Q?jgz+21u1UuL/TC0muEZu21RI9+EjCxgbrebg0lbYlJ6rGe4pjaPyIzpl++M0?= =?us-ascii?Q?10Na2QeTE+tSzzmrQOrDAdaDZFq/gBtM3udQHAZ5HDl1DpsewTMESCgIAQqM?= =?us-ascii?Q?a49iHuYwQq3UjUGKSweDmdYcgBWf85WXmhn1XpChSE1VZ7XWYtdTx2eCczkw?= =?us-ascii?Q?DE3dnLrKTAr1Ws4BKak6b051upGVdJGN0QlfBp7YXWJuPDx2IVzzV3GR8p48?= =?us-ascii?Q?oFeKEYPbHSdkx0mdyzJYkNy7JPVukJZW4Q7Q2D1mATCQFJxl/I+NI0cfOlLo?= =?us-ascii?Q?hPFw+T/ucobLvnC3nFQZOmJW2BmFFhcMQtZhA6Oave5qTMsBVxdg6zV8Tkxh?= =?us-ascii?Q?GoOT5tSXKLqRDP+S5SVDuflbU+rR7OguaRnQonWOmji8yUA3DpN/roM8qDNu?= =?us-ascii?Q?qB84YhIMy3GsXU8RNLwSY7pPOFG8CqhQhcZlscrw1LfxedPPK+fQ0KwywK8x?= =?us-ascii?Q?JUQzG+h6r3x7yuZPQHvnG8DlluGgDBvGi08zZ1E15xaUkoehLif46MPZRwtD?= =?us-ascii?Q?6s9b6odY5odj7xFAivg89I5iA1RQxsGU0EhyG8auiIA/lSYVmi7TJD8QFYtP?= =?us-ascii?Q?QDLs/EJ/EChpEpOBJlNlisvpE0CQJePmP7wtztJ6tyMmDWXLnN45fz46/8JJ?= =?us-ascii?Q?Zg=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 633a262b-1374-4a29-6788-08db20ba2486 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5056.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 16:20:05.3257 (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: +rh7lOoQndVzbgpYOnQqUM1lcpM3YcRKhujF7pPha1SzRJheRKKl72wpjTGgfkzOjysyhANeVY0q2g6xUCqrDRgYaKgz8gPxoVy0LsLMosg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7870 X-ZohoMail-DKIM: pass (identity @NXP1.onmicrosoft.com) X-ZM-MESSAGEID: 1678378839987100001 Content-Type: text/plain; charset="utf-8" From: Andrei Cherechesu Added support for parsing the ARM generic timer interrupts DT node by the "interrupt-names" property, if it is available. If not available, the usual parsing based on the expected IRQ order is performed. Also changed to treating returning 0 as an error case for the platform_get_irq() calls, since it is not a valid PPI ID and treating it as a valid case would only cause Xen to BUG() later, during vgic_reserve_virq(). Added the "hyp-virt" PPI to the timer PPI list, even though it's currently not in use. If the "hyp-virt" PPI is not found, the hypervisor won't panic. Signed-off-by: Andrei Cherechesu --- xen/arch/arm/include/asm/time.h | 3 ++- xen/arch/arm/time.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/include/asm/time.h b/xen/arch/arm/include/asm/tim= e.h index 4b401c1110..49ad8c1a6d 100644 --- a/xen/arch/arm/include/asm/time.h +++ b/xen/arch/arm/include/asm/time.h @@ -82,7 +82,8 @@ enum timer_ppi TIMER_PHYS_NONSECURE_PPI =3D 1, TIMER_VIRT_PPI =3D 2, TIMER_HYP_PPI =3D 3, - MAX_TIMER_PPI =3D 4, + TIMER_HYP_VIRT_PPI =3D 4, + MAX_TIMER_PPI =3D 5, }; =20 /* diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 433d7be909..868e03ecf6 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -38,6 +38,14 @@ uint32_t __read_mostly timer_dt_clock_frequency; =20 static unsigned int timer_irq[MAX_TIMER_PPI]; =20 +static const char *timer_irq_names[MAX_TIMER_PPI] =3D { + [TIMER_PHYS_SECURE_PPI] =3D "sec-phys", + [TIMER_PHYS_NONSECURE_PPI] =3D "phys", + [TIMER_VIRT_PPI] =3D "virt", + [TIMER_HYP_PPI] =3D "hyp-phys", + [TIMER_HYP_VIRT_PPI] =3D "hyp-virt", +}; + unsigned int timer_get_irq(enum timer_ppi ppi) { ASSERT(ppi >=3D TIMER_PHYS_SECURE_PPI && ppi < MAX_TIMER_PPI); @@ -149,15 +157,26 @@ static void __init init_dt_xen_time(void) { int res; unsigned int i; + bool has_names; + + has_names =3D dt_property_read_bool(timer, "interrupt-names"); =20 /* Retrieve all IRQs for the timer */ for ( i =3D TIMER_PHYS_SECURE_PPI; i < MAX_TIMER_PPI; i++ ) { - res =3D platform_get_irq(timer, i); - - if ( res < 0 ) + if ( has_names ) + res =3D platform_get_irq_byname(timer, timer_irq_names[i]); + else + res =3D platform_get_irq(timer, i); + + if ( res > 0 ) + timer_irq[i] =3D res; + /* + * Do not panic if "hyp-virt" PPI is not found, since it's not + * currently used. + */ + else if ( i !=3D TIMER_HYP_VIRT_PPI ) panic("Timer: Unable to retrieve IRQ %u from the device tree\n= ", i); - timer_irq[i] =3D res; } } =20 --=20 2.35.1