From nobody Thu Apr 9 13:33:31 2026 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; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1775642662; cv=none; d=zohomail.com; s=zohoarc; b=UCq86QFNB3wroCg/imD21V8OyQ3lB1DTABA5P0jZA1w3O4cJXF5T3kyK3pOrEnvnbOHUjSzVEAOARK0yMbUtFMGx2u+8hqAdOvC+ynNWXD6Hvk9gfsIIkduneR56eLrVfGJ+WIHNFbdlzt8Rr+GVCtEGQgD8xr/iZrjDF6VlE58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775642662; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QkYW84mNfsxJu25KdM9HhqHWqHHn7yyj15gOr+bOnfo=; b=jJBm8yu2+0hWkJ9dKlm3i/tEVePzcmzKXcj8Ub6eIOeZ5Mq8AqBGB0U2cJdqMw2/CvEy9r+LiTnUrncT2Ca3iLUwBVtRjiXttfRwXF8phyNYBhw2Qgtb9n7A6TUcEGMXvWLGeeUUhiJr2zRrZiJU+a9fGuIzyNxr0VAXLAVV7pc= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 177564266218840.01099150397408; Wed, 8 Apr 2026 03:04:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1275579.1561364 (Exim 4.92) (envelope-from ) id 1wAPlP-00052U-Dg; Wed, 08 Apr 2026 10:03:59 +0000 Received: by outflank-mailman (output) from mailman id 1275579.1561364; Wed, 08 Apr 2026 10:03:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPlP-00052N-Aq; Wed, 08 Apr 2026 10:03:59 +0000 Received: by outflank-mailman (input) for mailman id 1275579; Wed, 08 Apr 2026 10:03:57 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPlN-00051n-Lz for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 10:03:57 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wAPlN-005OmO-29 for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 12:03:57 +0200 Received: from [10.42.69.4] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d62801-e002-0a2a0a5209dd-0a2a4504b632-34 for ; Wed, 08 Apr 2026 12:03:56 +0200 Received: from [205.220.180.131] (helo=mx0b-0031df01.pphosted.com) by tlsNG-ebf023.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d6280b-bb33-0a2a45040019-cddcb483cba8-3 for ; Wed, 08 Apr 2026 12:03:56 +0200 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6389IjBj2412801 for ; Wed, 8 Apr 2026 10:03:55 GMT Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dd61vb73e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Apr 2026 10:03:54 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c769e2b1bd0so3345343a12.2 for ; Wed, 08 Apr 2026 03:03:54 -0700 (PDT) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b5fb22sm25805584b3a.26.2026.04.08.03.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:03:52 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=qcppdkim1 header.d=qualcomm.com header.i="@qualcomm.com" header.h="Cc:Content-Transfer-Encoding:Content-Type:Date:From:In-Reply-To:Message-Id:MIME-Version:References:Subject:To"; dkim=pass header.s=google header.d=oss.qualcomm.com header.i="@oss.qualcomm.com" header.h="Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding:MIME-Version:Subject:Date:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= QkYW84mNfsxJu25KdM9HhqHWqHHn7yyj15gOr+bOnfo=; b=RXcpx1ZRTwDeA/bt ToynNkAstqA1PSFVS/JPQHdD710GP5rO8S4CwZoNu7oIYfC1vOenA0X27aewuKVw 81ywxO/OmUWZfViYhWAifNW61bmT0shnPPbM6J3qNbZqVyj8dE1JYthoEsiXt7RU LAmRRcP57sn+14GrPaXSk+wUi3g682NCXUHY6IAOtry3ybMVNxYYqtaJ8Zglx58/ HoNmlbb6ZepFaKJImn42PemMsGBZvM0K37LRKyRiSUUuvn7xJ9kwI1EYql11OKLr H4IA8gcHjFMKDiPvotMv3m1lK4N/rj90/EYmBPIESe+e5/m0+KWwp22URgkxLZas 2N9ykw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775642634; x=1776247434; darn=lists.xenproject.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QkYW84mNfsxJu25KdM9HhqHWqHHn7yyj15gOr+bOnfo=; b=TipCdt28Nd0wvklA+FI5N2oGlhCBkR1NOk5QQvMscShNw9Z/n+3gDThY8WhZGc+mtx pgWgWXlDFvsH1m6NoPLthGwsTYcI4UiE5+jhembZVbKSkknj1/1oA+uHSBkH0R+IXNhM 7Xc3NOVE3sddLN/n3CSzjpT16Ao3CY4jMK6mbeCQT14OyGMrK9Lnx+UQH1nHdQPX9kSt orq2IE6aCzRdjuu9tL/kRoCAUoX8EPOQVZb1PC8qQSG69IcNaRiSWZEmxJrPvb6aL2Wc oO/L0sMU+feIHvuGN2ftC018Ufk7smOePP9mwyyZl1rFXMDgNvTWSFWAhZO5T+oLDx/p CNEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775642634; x=1776247434; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QkYW84mNfsxJu25KdM9HhqHWqHHn7yyj15gOr+bOnfo=; b=Y6qVLPs3Ugt/Y37cMHZsuuAGpyxp8UVVJvabo5sQwHWHKg1HtrbKDcDO7hCZevY9bw SZ/oNMLJYMU0djuhm5ogvhAYt2UDYQD9dXmdI00P8rJ8RjJi7Tze4MRj2m2zkfVe3+i3 PDfIvUfhUFLIlmtrVyJHSTJY8nmu6dfvQqENDToxQtvBz8tOB9rlqtMp+Zim/FAhoKS3 cFWIcIz9N88r3iJ/qjIv8Xo46XhLNMZkxSWrUNMjgKrlj8Y6SGUfXg+mNlK7qrJQ3auI E1Iv0YsabJ53QZwgFXLf2skbpm789Z8PZjp5UDMMmVHfZNqE5HWxuXQqBCzh0uTVSCxB pd7Q== X-Forwarded-Encrypted: i=1; AJvYcCVT/1kcgDYGWSiAMAjMjTUR6o0ZC0OvDHc5sZubSbMtJZ1FIX9OaLOSLn9kAOz/KeT64dRN5m/uqgs=@lists.xenproject.org X-Gm-Message-State: AOJu0YyiX38yRFBS7FO5dQxJTbBF/luo9k6hXr0b2X4g0b22j6uJz37c h/5zqeY4iB+4DChz3sszm6Jtcp7k/v5UHUCynOjS9hTTO1yfiL7tqIHiInqTe45dS6BVINZrDm6 iENjHpHvGqLjFMvzNjSTVHkDa1MXF/d5eHzey08hOTv+V4ZMem9f9ugZLGfGsrU/e3xNMcw== X-Gm-Gg: AeBDies0M1UmWwm6jTCdOGQwsoIdn3zWYdDLmlROEh4Pgf0ljvFzCAEU7MPQRq34n4g 0uP1OAcARH2B2nqD+DYwWeUXAGu8cV8FA5voav/7JfueONWXi3btR3TRTJONsDTpW7inV5iLr+7 DeHiyp8sWkaNRp2+jxcY2r0z7QBpT673ywtuzB9C+95cnkK09g+PgPywrfqAl1WUg7ti4sW9tUK HdFSnDS2GHqloabDxQs4yS23NVwHPXsmfAFSzFQexYfCS2rVcetQYrZrz7iTL20lnQPoH5CYOYx ZmmQBHwej3PyEy2AtVTfCDzfTJD9IydjLYlr48H5Xo3VQJzIkBcxoOlv7rZqUWxJjkyYcGra0Db aqaQE699QQ5sSZ8Jj29n3NM80Tlbl/iQcMLUB9uEQy0G5nGr507SltQb7 X-Received: by 2002:a05:6a00:3cd3:b0:82c:dd31:b84a with SMTP id d2e1a72fcca58-82d0dbaf6bbmr20222248b3a.43.1775642633633; Wed, 08 Apr 2026 03:03:53 -0700 (PDT) X-Received: by 2002:a05:6a00:3cd3:b0:82c:dd31:b84a with SMTP id d2e1a72fcca58-82d0dbaf6bbmr20222170b3a.43.1775642632934; Wed, 08 Apr 2026 03:03:52 -0700 (PDT) From: Vijayanand Jitta Date: Wed, 08 Apr 2026 15:33:25 +0530 Subject: [PATCH v13 1/3] of: Add convenience wrappers for of_map_id() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260408-parse_iommu_cells-v13-1-fa921e92661b@oss.qualcomm.com> References: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> In-Reply-To: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> To: Nipun Gupta , Nikhil Agarwal , Joerg Roedel , Will Deacon , Robin Murphy , Marc Zyngier , Lorenzo Pieralisi , Thomas Gleixner , Saravana Kannan , Richard Zhu , Lucas Stach , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dmitry Baryshkov , Konrad Dybcio , Bjorn Andersson , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Prakash Gupta , Vikash Garodia Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, imx@lists.linux.dev, xen-devel@lists.xenproject.org, linux-arm-msm@vger.kernel.org, Vijayanand Jitta X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775642611; l=8620; i=vijayanand.jitta@oss.qualcomm.com; s=20260301; h=from:subject:message-id; bh=Bsp9hT6sgzNh1NrIZ0uduUy4Yj5U0gq9szC+ECoPqVA=; b=1jtxyj1nljWs2knelvu9gUqx4z67op6AyycivTypsbxJkeSjly3E+2krvp1ZLhyNEF7EMJLhj LYIKR2726jgBjLtrOiKVCOc6gc8Gb2cOgDuSi2nJU0q4j2+F0zbtGNM X-Developer-Key: i=vijayanand.jitta@oss.qualcomm.com; a=ed25519; pk=Lpi7Cs3wHe8KZtqvyci7FTOLzsKpEHKGCaPNZw+1zRI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA4MDA5MSBTYWx0ZWRfX3u29PLxCMhfX +gX9z4FTHp8YuowL5yQfA+2+z29To4UkSlO1Ao9x0M4fFzS6VPuTx1jKmPDpvEvma3FZ8lIumFh no2iSNmUbTT14yqtDDbtbzPDuzCV0CLdmUuKFvsaSEizWOINAS+9liHNDbnurg6Y9vJt5Y2o6yn KN1YwoIDKA8oC02+4yNfsQxF5FUXyQ+w0T/nKS+M5kVx1kamihwamk0ONUfX/zidmPrknh5alV/ 8uz9RRJ2VFde3037Kx8F2sfk2thPoyhgqCthRhAXgSGec+Sf5RCzL/+ilqXZ6xeDIBIa2LOSQSA 1FJiJ5ptLiNp2sjQ9YQdGZljytOHxwqFpAeiKYSyDciKfauEtD786BBkDtVZR2lV4cPYxfkYFml so+74rhTcwwLp0CVgfARAAJAU4IhEhtxJT2xPyWbJBAq33CvVILiejClxDtRxK6hca13x1RRXyZ 0iBICJa1hu/5uprdSCA== X-Authority-Analysis: v=2.4 cv=FecHAp+6 c=1 sm=1 tr=0 ts=69d6280a cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=7CQSdrXTAAAA:8 a=VwQbUJbxAAAA:8 a=8AirrxEcAAAA:8 a=1XWaLZrsAAAA:8 a=EUspDBNiAAAA:8 a=f4O9XJQV64orvU1ydW8A:9 a=QEXdDO2ut3YA:10 a=x9snwWr2DeNwDh03kgHS:22 a=a-qgeE7W1pNrGK8U0ZQC:22 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-ORIG-GUID: ot3n1OWaZf-qE85YEFcLsk6vM0hzh780 X-Proofpoint-GUID: ot3n1OWaZf-qE85YEFcLsk6vM0hzh780 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-08_03,2026-04-08_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604080091 X-purgate-ID: tlsNG-ebf023/1775642636-B112D51B-D23BB296/0/0 X-purgate-type: clean X-purgate-size: 8667 X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1775642665035154100 From: Robin Murphy Since we now have quite a few users parsing "iommu-map" and "msi-map" properties, give them some wrappers to conveniently encapsulate the appropriate sets of property names. This will also make it easier to then change of_map_id() to correctly account for specifier cells. Reviewed-by: Rob Herring (Arm) Reviewed-by: Frank Li Acked-by: Marc Zyngier Acked-by: Bjorn Helgaas Signed-off-by: Robin Murphy Signed-off-by: Vijayanand Jitta --- drivers/cdx/cdx_msi.c | 3 +-- drivers/iommu/of_iommu.c | 4 +--- drivers/irqchip/irq-gic-its-msi-parent.c | 2 +- drivers/of/base.c | 38 ++++++++++++++++++++++++++++= ++++ drivers/of/irq.c | 3 +-- drivers/pci/controller/dwc/pci-imx6.c | 6 ++--- drivers/pci/controller/pcie-apple.c | 3 +-- drivers/xen/grant-dma-ops.c | 3 +-- include/linux/of.h | 18 +++++++++++++++ 9 files changed, 64 insertions(+), 16 deletions(-) diff --git a/drivers/cdx/cdx_msi.c b/drivers/cdx/cdx_msi.c index 91b95422b263..63b3544ec997 100644 --- a/drivers/cdx/cdx_msi.c +++ b/drivers/cdx/cdx_msi.c @@ -128,8 +128,7 @@ static int cdx_msi_prepare(struct irq_domain *msi_domai= n, int ret; =20 /* Retrieve device ID from requestor ID using parent device */ - ret =3D of_map_id(parent->of_node, cdx_dev->msi_dev_id, "msi-map", "msi-m= ap-mask", - NULL, &dev_id); + ret =3D of_map_msi_id(parent->of_node, cdx_dev->msi_dev_id, NULL, &dev_id= ); if (ret) { dev_err(dev, "of_map_id failed for MSI: %d\n", ret); return ret; diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 6b989a62def2..a511ecf21fcd 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -48,9 +48,7 @@ static int of_iommu_configure_dev_id(struct device_node *= master_np, struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; int err; =20 - err =3D of_map_id(master_np, *id, "iommu-map", - "iommu-map-mask", &iommu_spec.np, - iommu_spec.args); + err =3D of_map_iommu_id(master_np, *id, &iommu_spec.np, iommu_spec.args); if (err) return err; =20 diff --git a/drivers/irqchip/irq-gic-its-msi-parent.c b/drivers/irqchip/irq= -gic-its-msi-parent.c index d36b278ae66c..b63343a227a9 100644 --- a/drivers/irqchip/irq-gic-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-its-msi-parent.c @@ -180,7 +180,7 @@ static int of_pmsi_get_msi_info(struct irq_domain *doma= in, struct device *dev, u =20 struct device_node *msi_ctrl __free(device_node) =3D NULL; =20 - return of_map_id(dev->of_node, dev->id, "msi-map", "msi-map-mask", &msi_c= trl, dev_id); + return of_map_msi_id(dev->of_node, dev->id, &msi_ctrl, dev_id); } =20 static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, diff --git a/drivers/of/base.c b/drivers/of/base.c index 57420806c1a2..ae04487bd614 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2201,3 +2201,41 @@ int of_map_id(const struct device_node *np, u32 id, return 0; } EXPORT_SYMBOL_GPL(of_map_id); + +/** + * of_map_iommu_id - Translate an ID using "iommu-map" bindings. + * @np: root complex device node. + * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform + * stream/device ID) used as the lookup key in the iommu-map table. + * @target: optional pointer to a target device node. + * @id_out: optional pointer to receive the translated ID. + * + * Convenience wrapper around of_map_id() using "iommu-map" and "iommu-map= -mask". + * + * Return: 0 on success or a standard error code on failure. + */ +int of_map_iommu_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out) +{ + return of_map_id(np, id, "iommu-map", "iommu-map-mask", target, id_out); +} +EXPORT_SYMBOL_GPL(of_map_iommu_id); + +/** + * of_map_msi_id - Translate an ID using "msi-map" bindings. + * @np: root complex device node. + * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform + * stream/device ID) used as the lookup key in the msi-map table. + * @target: optional pointer to a target device node. + * @id_out: optional pointer to receive the translated ID. + * + * Convenience wrapper around of_map_id() using "msi-map" and "msi-map-mas= k". + * + * Return: 0 on success or a standard error code on failure. + */ +int of_map_msi_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out) +{ + return of_map_id(np, id, "msi-map", "msi-map-mask", target, id_out); +} +EXPORT_SYMBOL_GPL(of_map_msi_id); diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 6367c67732d2..e37c1b3f8736 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -817,8 +817,7 @@ u32 of_msi_xlate(struct device *dev, struct device_node= **msi_np, u32 id_in) * "msi-map" or an "msi-parent" property. */ for (parent_dev =3D dev; parent_dev; parent_dev =3D parent_dev->parent) { - if (!of_map_id(parent_dev->of_node, id_in, "msi-map", - "msi-map-mask", msi_np, &id_out)) + if (!of_map_msi_id(parent_dev->of_node, id_in, msi_np, &id_out)) break; if (!of_check_msi_parent(parent_dev->of_node, msi_np)) break; diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller= /dwc/pci-imx6.c index a5b8d0b71677..bff8289f804a 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1144,8 +1144,7 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie *i= mx_pcie, u32 rid) u32 sid =3D 0; =20 target =3D NULL; - err_i =3D of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", - &target, &sid_i); + err_i =3D of_map_iommu_id(dev->of_node, rid, &target, &sid_i); if (target) { of_node_put(target); } else { @@ -1158,8 +1157,7 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie *i= mx_pcie, u32 rid) } =20 target =3D NULL; - err_m =3D of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", - &target, &sid_m); + err_m =3D of_map_msi_id(dev->of_node, rid, &target, &sid_m); =20 /* * err_m target diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/p= cie-apple.c index 2d92fc79f6dd..a0937b7b3c4d 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -764,8 +764,7 @@ static int apple_pcie_enable_device(struct pci_host_bri= dge *bridge, struct pci_d dev_dbg(&pdev->dev, "added to bus %s, index %d\n", pci_name(pdev->bus->self), port->idx); =20 - err =3D of_map_id(port->pcie->dev->of_node, rid, "iommu-map", - "iommu-map-mask", NULL, &sid); + err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, NULL, &sid); if (err) return err; =20 diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index c2603e700178..1b7696b2d762 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -325,8 +325,7 @@ static int xen_dt_grant_init_backend_domid(struct devic= e *dev, struct pci_dev *pdev =3D to_pci_dev(dev); u32 rid =3D PCI_DEVID(pdev->bus->number, pdev->devfn); =20 - if (of_map_id(np, rid, "iommu-map", "iommu-map-mask", &iommu_spec.np, - iommu_spec.args)) { + if (of_map_iommu_id(np, rid, &iommu_spec.np, iommu_spec.args)) { dev_dbg(dev, "Cannot translate ID\n"); return -ESRCH; } diff --git a/include/linux/of.h b/include/linux/of.h index be6ec4916adf..fe841f3cc747 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -465,6 +465,12 @@ int of_map_id(const struct device_node *np, u32 id, const char *map_name, const char *map_mask_name, struct device_node **target, u32 *id_out); =20 +int of_map_iommu_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out); + +int of_map_msi_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out); + phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 struct kimage; @@ -934,6 +940,18 @@ static inline int of_map_id(const struct device_node *= np, u32 id, return -EINVAL; } =20 +static inline int of_map_iommu_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out) +{ + return -EINVAL; +} + +static inline int of_map_msi_id(const struct device_node *np, u32 id, + struct device_node **target, u32 *id_out) +{ + return -EINVAL; +} + static inline phys_addr_t of_dma_get_max_cpu_address(struct device_node *n= p) { return PHYS_ADDR_MAX; --=20 2.34.1 From nobody Thu Apr 9 13:33:31 2026 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; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1775642665; cv=none; d=zohomail.com; s=zohoarc; b=O5cDkJtaYSYF94a/tsyULkZUVN4laPeXXF4rohTgCm5YVwRaQ2JPpSGMS2AaHLxL2tGFQz82QIjUtNGHOW6sJhEudHJZHkRvyPyuxM2GvPLyhJu8YnYa4AX/+WAus7jZX38zfHqXzC83qJYejfkFQEJWoIqJURz1/Rf2zb3/ct0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775642665; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LftlAsbVwS/LONmw0RaxWOkTUJkuy159/kDEWiGHeOU=; b=fp4iaGe2gtux1p/vvoYrKR4z4u4GTEavsu/9yguDIlMoZTh9r9m/KzJQ4YC8Sh92NF2h26RYABSPBh6WcAOlU3YpLgrs2g0N+SIDtrI5PPCkWEwFOsn1EBW0mKixVDVZbJTTtRgi7H3YbFNTpEHLHPDgIUkn3zdA0Ly3hg0Ou6w= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1775642665137790.5730267199814; Wed, 8 Apr 2026 03:04:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1275586.1561374 (Exim 4.92) (envelope-from ) id 1wAPlb-0005Oq-Qc; Wed, 08 Apr 2026 10:04:11 +0000 Received: by outflank-mailman (output) from mailman id 1275586.1561374; Wed, 08 Apr 2026 10:04:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPlb-0005Oj-Mm; Wed, 08 Apr 2026 10:04:11 +0000 Received: by outflank-mailman (input) for mailman id 1275586; Wed, 08 Apr 2026 10:04:09 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPlZ-0005NN-Mm for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 10:04:09 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wAPlZ-005OpX-2Q for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 12:04:09 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d62808-e002-0a2a0a5209dd-0a2a4502a512-42 for ; Wed, 08 Apr 2026 12:04:08 +0200 Received: from [205.220.168.131] (helo=mx0a-0031df01.pphosted.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d62816-42fa-0a2a45020019-cddca883db5c-3 for ; Wed, 08 Apr 2026 12:04:08 +0200 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6385gdUV1314545 for ; Wed, 8 Apr 2026 10:04:06 GMT Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dd8d6jmkf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Apr 2026 10:04:05 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c741f038f7cso3117064a12.2 for ; Wed, 08 Apr 2026 03:04:05 -0700 (PDT) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b5fb22sm25805584b3a.26.2026.04.08.03.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:04:03 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=qcppdkim1 header.d=qualcomm.com header.i="@qualcomm.com" header.h="Cc:Content-Transfer-Encoding:Content-Type:Date:From:In-Reply-To:Message-Id:MIME-Version:References:Subject:To"; dkim=pass header.s=google header.d=oss.qualcomm.com header.i="@oss.qualcomm.com" header.h="Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding:MIME-Version:Subject:Date:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= LftlAsbVwS/LONmw0RaxWOkTUJkuy159/kDEWiGHeOU=; b=LAiLxO1BD7vh+fCW 9zog4cWFQ2aUUAAU4u97Wiww2EYJV4OyZpi+sDmgi/Np69A+k863UMjoG5PoRdM0 SISI8JUICL+4hTBTJ88QfgXfcWRC17hjjK0GUfb+3hUpS0SYGZ4uH2q+K7TZqZ61 4uNjArmo3J0xlCmHTi+T0AwCUOntmNXdvS2oU9Luw33xLYELWUR57/v8ahWPj+gw hXJv2dh91+vbpOwqQ5whS9Wl2q+Zfq/4/kRS4/+DSvwJclnGCjaQSaHaIYfyHiP2 qlhz+nOpf8NLboTUTZDVRBMzXOsUPybAtlEzmi4rCsikKE4U+OO34UyyxyRQ96A1 hPMFPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775642645; x=1776247445; darn=lists.xenproject.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LftlAsbVwS/LONmw0RaxWOkTUJkuy159/kDEWiGHeOU=; b=F+At+cWmkOPbm59N2bqlNCPz11M7yDaC+v7M1rs0rMqZuQB20ySl4QAHOvpbfUHrgt HuUArT+dBn29e8inaw/9qTkiUfMmnx2Y25sVKrVuwF84G30SrHW8M+9k741SNkcu3ukv 6Hl5GDy2MF0jlWmcLgF5rdJ/7Qrp+iPxW45obMPJ7pvAzbp8f2t9jwWvpC1DT8IyVtlm E1AzVHimBRWZdnoWssT6ez3JsSeWkcB27RWopLJ5InTOqnrOsWXKavHRAda4q51QMBWk Ld6b/By1Qzbi/LpqV6wG96zW1Ngtsxk3H/v7ZcqPzqehrAEbBE8gmcKi80Gnk8/KDLGp D2SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775642645; x=1776247445; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LftlAsbVwS/LONmw0RaxWOkTUJkuy159/kDEWiGHeOU=; b=O3nLsw48WgL+Xr55ZigpB17vMuz2/3QtoSsFTlOJrI++PWye1cNVrBQgw0s9oVuamv UupKq8oCBuU0M75iDveQowPqXNni4RCeOvgCu+XLvQhFjTtzKG2wvmMgnRCLCD+YmLkE kW7a4ePNCsfwAXSv00E5w05624JBRGiPDpgfTAXsKh6CZBEJg59CgXKGOanoGiF8U7f4 zmjr/VfXbiYQZtiVyKnBW+3ENheBU9X1LpznzCGWyy5HIFJZesFdzBfRBjCEttY+Zkdc 3pyHu4MMWD4fT0Xb896PdtxUasYwoXCLzA+zqbbXpD6VkcgCN4k/g0fptGfaL1haT+hd 0GJw== X-Forwarded-Encrypted: i=1; AJvYcCUjAa49H6pWEsAb7nzVT0SyqWcoKDoP3MrhxPOoh5kwkXQiV9x8WPPW0uHxVN30sVeG07kZbxx9zI4=@lists.xenproject.org X-Gm-Message-State: AOJu0YyQkmDBF477yyRyLIflj0/ODPW9f7uALtdwYU3RXZMyNGc1BXgM Hu+4r0pDoCLL2Me5KxTIePOqY60hLu63GyWJjU+1OfLWK6SQ5Y9GKyq9hNGvbmT3RLKhw9/QUDO KiBFBx33eZ2sKkXNym/ShLBGA3534+ytQWG5tvLP9xgeBO8GBbg+LqNXlfZDZmyJ0K12c+w== X-Gm-Gg: AeBDieu92yphnJ3N72ip5vVFY0v0/J2gj7RYXHMKKsGAyB12BbxF69mmsV/9IT5GQME pIBtomNJV8Ew2lL3xXpz7HSrAQ6u+4/Jj5iIeXuZqFfm+zF5S8e+/MZ0OQoYfBq/aekZgvKIgNG X1PMB9ck/Mu2OFVTQzBgjM8xkptef+0Pf/b5Eg775uTYfuL/Xpd0S8uQ13DLCaaJoJbHyhymvst BoMtVdWoPU7P1eups2c6gzgbu/BjzdAXDjLOhgVt0CXG2M8Ee1k3APNTWtQIkdWyqyrL4X+gD+g aWFbYKSlgwi27IVEqnHud71wtFLiGNLcgLi5A9YQGuJ0tf6jfco1+vezkg5GsX8BZXyjH9Ql9rH EY86/tXrbpnupjHIeIYKK9qwxawBGueVj39UW1g9dK4SHYY0RAuKSitvA X-Received: by 2002:aa7:9064:0:b0:823:9b7:9c0e with SMTP id d2e1a72fcca58-82d0db3fcadmr19724260b3a.34.1775642644400; Wed, 08 Apr 2026 03:04:04 -0700 (PDT) X-Received: by 2002:aa7:9064:0:b0:823:9b7:9c0e with SMTP id d2e1a72fcca58-82d0db3fcadmr19724216b3a.34.1775642643764; Wed, 08 Apr 2026 03:04:03 -0700 (PDT) From: Vijayanand Jitta Date: Wed, 08 Apr 2026 15:33:26 +0530 Subject: [PATCH v13 2/3] of: Factor arguments passed to of_map_id() into a struct MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260408-parse_iommu_cells-v13-2-fa921e92661b@oss.qualcomm.com> References: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> In-Reply-To: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> To: Nipun Gupta , Nikhil Agarwal , Joerg Roedel , Will Deacon , Robin Murphy , Marc Zyngier , Lorenzo Pieralisi , Thomas Gleixner , Saravana Kannan , Richard Zhu , Lucas Stach , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dmitry Baryshkov , Konrad Dybcio , Bjorn Andersson , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Prakash Gupta , Vikash Garodia Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, imx@lists.linux.dev, xen-devel@lists.xenproject.org, linux-arm-msm@vger.kernel.org, Vijayanand Jitta , Charan Teja Kalla X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775642611; l=16836; i=vijayanand.jitta@oss.qualcomm.com; s=20260301; h=from:subject:message-id; bh=+iHtXnzXX7tUfRgnJZTT3PPuzqB/B1rZOKoBHBRglbM=; b=IAMyeocADMhmvA4SgwDS0z+JbmH0dY67ow40byP8ue4sGh9U7Nn0o8DY6pFoTPPSfd8PgSH2Y cWMN/CtdOuNDmBuTSn54zFukHJBLLndS4B3UZ5Te+nNN953oWTRYqsZ X-Developer-Key: i=vijayanand.jitta@oss.qualcomm.com; a=ed25519; pk=Lpi7Cs3wHe8KZtqvyci7FTOLzsKpEHKGCaPNZw+1zRI= X-Proofpoint-ORIG-GUID: FKDQBsady8ghSpCTqFCt5ZVF2_Zce6ki X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA4MDA5MSBTYWx0ZWRfX1/jnFG2U3iSX vg11DVeRRJZS3c92k29jbr9yC+8jouggRQDzOt65og3ypU4259kMgwEkoYaU35l7s5u0cY8XXoX KR+ovfC3gjr7X57oGdzKhTGnE6QSMpU+/H69n5v85HXGFlzwEutrRUXx2xlS3wO1dxaCsWmxyPA qSwvlNhys/ei0zSXGFFTFAxPb3+vm4RqH9/36mwuiSD/uDyeZ0caOdmob3QCOm+40mttKm3U+ZN ewj9amQuL5k8iK3kVFfC/psqlAVehd4JkT0Nc2feqZbFiSe/qaI7Lpkxc+mkOwYjtiBYOtFMdij nI9Q6CX3xAv3jXjO8zgOmhcm346rUnER42KkdhH+Nf8TciMOmyvE6TS/66XX4LPGMqPANaFCqHr tQVkmovA+fD2Qc3FC0ij2i63hGd01Vp6Fh1igyoG4RXpVtFNFn1rKTKz1j3hVuJSi2yd10BCNiz CeWZB54d4CxsK1PPQJw== X-Authority-Analysis: v=2.4 cv=GN041ONK c=1 sm=1 tr=0 ts=69d62816 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=8AirrxEcAAAA:8 a=VwQbUJbxAAAA:8 a=NTCK2b4J3l3c-VTkqyoA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-GUID: FKDQBsady8ghSpCTqFCt5ZVF2_Zce6ki X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-08_03,2026-04-08_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 suspectscore=0 clxscore=1015 spamscore=0 adultscore=0 bulkscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604080091 X-purgate-ID: tlsNG-720697/1775642648-44BF5CD1-88A7AF14/0/0 X-purgate-type: clean X-purgate-size: 16897 X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1775642666367158500 From: Charan Teja Kalla Change of_map_id() to take a pointer to struct of_phandle_args instead of passing target device node and translated IDs separately. Update all callers accordingly. Add an explicit filter_np parameter to of_map_id() and of_map_msi_id() to separate the filter input from the output. Previously, the target parameter served dual purpose: as an input filter (if non-NULL, only match entries targeting that node) and as an output (receiving the matched node with a reference held). Now filter_np is the explicit input filter and arg->np is the pure output. Previously, of_map_id() would call of_node_put() on the matched node when a filter was provided, making reference ownership inconsistent. Remove this internal of_node_put() call so that of_map_id() now always transfers ownership of the matched node reference to the caller via arg->np. Callers are now consistently responsible for releasing this reference with of_node_put(arg->np) when done. Acked-by: Frank Li Suggested-by: Rob Herring (Arm) Suggested-by: Dmitry Baryshkov Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/cdx/cdx_msi.c | 7 ++-- drivers/iommu/of_iommu.c | 4 +- drivers/irqchip/irq-gic-its-msi-parent.c | 11 ++++-- drivers/of/base.c | 68 +++++++++++++++++-----------= ---- drivers/of/irq.c | 10 ++++- drivers/pci/controller/dwc/pci-imx6.c | 32 +++++++-------- drivers/pci/controller/pcie-apple.c | 5 ++- drivers/xen/grant-dma-ops.c | 4 +- include/linux/of.h | 14 ++++--- 9 files changed, 89 insertions(+), 66 deletions(-) diff --git a/drivers/cdx/cdx_msi.c b/drivers/cdx/cdx_msi.c index 63b3544ec997..6924e07c7528 100644 --- a/drivers/cdx/cdx_msi.c +++ b/drivers/cdx/cdx_msi.c @@ -121,22 +121,23 @@ static int cdx_msi_prepare(struct irq_domain *msi_dom= ain, struct device *dev, int nvec, msi_alloc_info_t *info) { + struct of_phandle_args msi_spec =3D {}; struct cdx_device *cdx_dev =3D to_cdx_device(dev); struct device *parent =3D cdx_dev->cdx->dev; struct msi_domain_info *msi_info; - u32 dev_id; int ret; =20 /* Retrieve device ID from requestor ID using parent device */ - ret =3D of_map_msi_id(parent->of_node, cdx_dev->msi_dev_id, NULL, &dev_id= ); + ret =3D of_map_msi_id(parent->of_node, cdx_dev->msi_dev_id, NULL, &msi_sp= ec); if (ret) { dev_err(dev, "of_map_id failed for MSI: %d\n", ret); return ret; } + of_node_put(msi_spec.np); =20 #ifdef GENERIC_MSI_DOMAIN_OPS /* Set the device Id to be passed to the GIC-ITS */ - info->scratchpad[0].ul =3D dev_id; + info->scratchpad[0].ul =3D msi_spec.args[0]; #endif =20 msi_info =3D msi_get_domain_info(msi_domain->parent); diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index a511ecf21fcd..a18bb60f6f3d 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -45,10 +45,10 @@ static int of_iommu_configure_dev_id(struct device_node= *master_np, struct device *dev, const u32 *id) { - struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; + struct of_phandle_args iommu_spec =3D {}; int err; =20 - err =3D of_map_iommu_id(master_np, *id, &iommu_spec.np, iommu_spec.args); + err =3D of_map_iommu_id(master_np, *id, &iommu_spec); if (err) return err; =20 diff --git a/drivers/irqchip/irq-gic-its-msi-parent.c b/drivers/irqchip/irq= -gic-its-msi-parent.c index b63343a227a9..dd5f84b6470a 100644 --- a/drivers/irqchip/irq-gic-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-its-msi-parent.c @@ -152,6 +152,8 @@ static int its_v5_pci_msi_prepare(struct irq_domain *do= main, struct device *dev, static int of_pmsi_get_msi_info(struct irq_domain *domain, struct device *= dev, u32 *dev_id, phys_addr_t *pa) { + struct device_node *msi_ctrl __free(device_node) =3D NULL; + struct of_phandle_args msi_spec =3D {}; struct of_phandle_iterator it; int ret; =20 @@ -178,9 +180,12 @@ static int of_pmsi_get_msi_info(struct irq_domain *dom= ain, struct device *dev, u } } =20 - struct device_node *msi_ctrl __free(device_node) =3D NULL; - - return of_map_msi_id(dev->of_node, dev->id, &msi_ctrl, dev_id); + ret =3D of_map_msi_id(dev->of_node, dev->id, NULL, &msi_spec); + if (!ret) { + msi_ctrl =3D msi_spec.np; + *dev_id =3D msi_spec.args[0]; + } + return ret; } =20 static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, diff --git a/drivers/of/base.c b/drivers/of/base.c index ae04487bd614..b3d002015192 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2102,36 +2102,37 @@ int of_find_last_cache_level(unsigned int cpu) * @id: device ID to map. * @map_name: property name of the map to use. * @map_mask_name: optional property name of the mask to use. - * @target: optional pointer to a target device node. - * @id_out: optional pointer to receive the translated ID. + * @filter_np: optional device node to filter matches by, or NULL to match= any. + * If non-NULL, only map entries targeting this node will be matched. + * @arg: pointer to a &struct of_phandle_args for the result. On success, + * @arg->args[0] will contain the translated ID. If a map entry was + * matched, @arg->np will be set to the target node with a reference + * held that the caller must release with of_node_put(). * * Given a device ID, look up the appropriate implementation-defined * platform ID and/or the target device which receives transactions on that - * ID, as per the "iommu-map" and "msi-map" bindings. Either of @target or - * @id_out may be NULL if only the other is required. If @target points to - * a non-NULL device node pointer, only entries targeting that node will be - * matched; if it points to a NULL value, it will receive the device node = of - * the first matching target phandle, with a reference held. + * ID, as per the "iommu-map" and "msi-map" bindings. * * Return: 0 on success or a standard error code on failure. */ int of_map_id(const struct device_node *np, u32 id, const char *map_name, const char *map_mask_name, - struct device_node **target, u32 *id_out) + const struct device_node *filter_np, struct of_phandle_args *arg) { u32 map_mask, masked_id; int map_len; const __be32 *map =3D NULL; =20 - if (!np || !map_name || (!target && !id_out)) + if (!np || !map_name || !arg) return -EINVAL; =20 map =3D of_get_property(np, map_name, &map_len); if (!map) { - if (target) + if (filter_np) return -ENODEV; /* Otherwise, no map implies no translation */ - *id_out =3D id; + arg->args[0] =3D id; + arg->args_count =3D 1; return 0; } =20 @@ -2173,18 +2174,14 @@ int of_map_id(const struct device_node *np, u32 id, if (!phandle_node) return -ENODEV; =20 - if (target) { - if (*target) - of_node_put(phandle_node); - else - *target =3D phandle_node; - - if (*target !=3D phandle_node) - continue; + if (filter_np && filter_np !=3D phandle_node) { + of_node_put(phandle_node); + continue; } =20 - if (id_out) - *id_out =3D masked_id - id_base + out_base; + arg->np =3D phandle_node; + arg->args[0] =3D masked_id - id_base + out_base; + arg->args_count =3D 1; =20 pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, leng= th: %08x, id: %08x -> %08x\n", np, map_name, map_mask, id_base, out_base, @@ -2193,11 +2190,11 @@ int of_map_id(const struct device_node *np, u32 id, } =20 pr_info("%pOF: no %s translation for id 0x%x on %pOF\n", np, map_name, - id, target && *target ? *target : NULL); + id, filter_np); =20 /* Bypasses translation */ - if (id_out) - *id_out =3D id; + arg->args[0] =3D id; + arg->args_count =3D 1; return 0; } EXPORT_SYMBOL_GPL(of_map_id); @@ -2207,17 +2204,19 @@ EXPORT_SYMBOL_GPL(of_map_id); * @np: root complex device node. * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform * stream/device ID) used as the lookup key in the iommu-map table. - * @target: optional pointer to a target device node. - * @id_out: optional pointer to receive the translated ID. + * @arg: pointer to a &struct of_phandle_args for the result. On success, + * @arg->args[0] contains the translated ID. If a map entry was matched, + * @arg->np holds a reference to the target node that the caller must + * release with of_node_put(). * * Convenience wrapper around of_map_id() using "iommu-map" and "iommu-map= -mask". * * Return: 0 on success or a standard error code on failure. */ int of_map_iommu_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out) + struct of_phandle_args *arg) { - return of_map_id(np, id, "iommu-map", "iommu-map-mask", target, id_out); + return of_map_id(np, id, "iommu-map", "iommu-map-mask", NULL, arg); } EXPORT_SYMBOL_GPL(of_map_iommu_id); =20 @@ -2226,16 +2225,21 @@ EXPORT_SYMBOL_GPL(of_map_iommu_id); * @np: root complex device node. * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform * stream/device ID) used as the lookup key in the msi-map table. - * @target: optional pointer to a target device node. - * @id_out: optional pointer to receive the translated ID. + * @filter_np: optional MSI controller node to filter matches by, or NULL + * to match any. If non-NULL, only map entries targeting this node will + * be matched. + * @arg: pointer to a &struct of_phandle_args for the result. On success, + * @arg->args[0] contains the translated ID. If a map entry was matched, + * @arg->np holds a reference to the target node that the caller must + * release with of_node_put(). * * Convenience wrapper around of_map_id() using "msi-map" and "msi-map-mas= k". * * Return: 0 on success or a standard error code on failure. */ int of_map_msi_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out) + const struct device_node *filter_np, struct of_phandle_args *arg) { - return of_map_id(np, id, "msi-map", "msi-map-mask", target, id_out); + return of_map_id(np, id, "msi-map", "msi-map-mask", filter_np, arg); } EXPORT_SYMBOL_GPL(of_map_msi_id); diff --git a/drivers/of/irq.c b/drivers/of/irq.c index e37c1b3f8736..f86a56bd81fc 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -817,8 +817,16 @@ u32 of_msi_xlate(struct device *dev, struct device_nod= e **msi_np, u32 id_in) * "msi-map" or an "msi-parent" property. */ for (parent_dev =3D dev; parent_dev; parent_dev =3D parent_dev->parent) { - if (!of_map_msi_id(parent_dev->of_node, id_in, msi_np, &id_out)) + struct of_phandle_args msi_spec =3D {}; + + if (!of_map_msi_id(parent_dev->of_node, id_in, *msi_np, &msi_spec)) { + id_out =3D msi_spec.args[0]; + if (!*msi_np) + *msi_np =3D msi_spec.np; + else + of_node_put(msi_spec.np); break; + } if (!of_check_msi_parent(parent_dev->of_node, msi_np)) break; } diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller= /dwc/pci-imx6.c index bff8289f804a..c0544d9c0921 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1137,30 +1137,32 @@ static void imx_pcie_remove_lut(struct imx_pcie *im= x_pcie, u16 rid) =20 static int imx_pcie_add_lut_by_rid(struct imx_pcie *imx_pcie, u32 rid) { + struct of_phandle_args iommu_spec =3D {}; + struct of_phandle_args msi_spec =3D {}; struct device *dev =3D imx_pcie->pci->dev; - struct device_node *target; u32 sid_i, sid_m; int err_i, err_m; u32 sid =3D 0; =20 - target =3D NULL; - err_i =3D of_map_iommu_id(dev->of_node, rid, &target, &sid_i); - if (target) { - of_node_put(target); - } else { + err_i =3D of_map_iommu_id(dev->of_node, rid, &iommu_spec); + if (!err_i) + sid_i =3D iommu_spec.args[0]; + of_node_put(iommu_spec.np); + if (!err_i && !iommu_spec.np) { /* - * "target =3D=3D NULL && err_i =3D=3D 0" means RID out of map range. - * Use 1:1 map RID to streamID. Hardware can't support this - * because the streamID is only 6 bits + * "iommu_spec.np =3D=3D NULL && err_i =3D=3D 0" means RID out of map + * range. Use 1:1 map RID to streamID. Hardware can't support + * this because the streamID is only 6 bits. */ err_i =3D -EINVAL; } =20 - target =3D NULL; - err_m =3D of_map_msi_id(dev->of_node, rid, &target, &sid_m); - + err_m =3D of_map_msi_id(dev->of_node, rid, NULL, &msi_spec); + if (!err_m) + sid_m =3D msi_spec.args[0]; + of_node_put(msi_spec.np); /* - * err_m target + * err_m msi_spec.np * 0 NULL RID out of range. Use 1:1 map RID to * streamID, Current hardware can't * support it, so return -EINVAL. @@ -1168,10 +1170,8 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie *= imx_pcie, u32 rid) * 0 !=3D NULL Get correct streamID from RID * !=3D 0 !=3D NULL Invalid combination */ - if (!err_m && !target) + if (!err_m && !msi_spec.np) return -EINVAL; - else if (target) - of_node_put(target); /* Find streamID map entry for RID in msi-map */ =20 /* * msi-map iommu-map diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/p= cie-apple.c index a0937b7b3c4d..c2cffc0659f4 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -755,6 +755,7 @@ static int apple_pcie_enable_device(struct pci_host_bri= dge *bridge, struct pci_d { u32 sid, rid =3D pci_dev_id(pdev); struct apple_pcie_port *port; + struct of_phandle_args iommu_spec =3D {}; int idx, err; =20 port =3D apple_pcie_get_port(pdev); @@ -764,10 +765,12 @@ static int apple_pcie_enable_device(struct pci_host_b= ridge *bridge, struct pci_d dev_dbg(&pdev->dev, "added to bus %s, index %d\n", pci_name(pdev->bus->self), port->idx); =20 - err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, NULL, &sid); + err =3D of_map_iommu_id(port->pcie->dev->of_node, rid, &iommu_spec); if (err) return err; =20 + of_node_put(iommu_spec.np); + sid =3D iommu_spec.args[0]; mutex_lock(&port->pcie->lock); =20 idx =3D bitmap_find_free_region(port->sid_map, port->sid_map_sz, 0); diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 1b7696b2d762..2aa1a772a0ff 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -319,13 +319,13 @@ static int xen_dt_grant_init_backend_domid(struct dev= ice *dev, struct device_node *np, domid_t *backend_domid) { - struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; + struct of_phandle_args iommu_spec =3D {}; =20 if (dev_is_pci(dev)) { struct pci_dev *pdev =3D to_pci_dev(dev); u32 rid =3D PCI_DEVID(pdev->bus->number, pdev->devfn); =20 - if (of_map_iommu_id(np, rid, &iommu_spec.np, iommu_spec.args)) { + if (of_map_iommu_id(np, rid, &iommu_spec)) { dev_dbg(dev, "Cannot translate ID\n"); return -ESRCH; } diff --git a/include/linux/of.h b/include/linux/of.h index fe841f3cc747..8548cd9eb4f1 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -463,13 +463,13 @@ bool of_console_check(const struct device_node *dn, c= har *name, int index); =20 int of_map_id(const struct device_node *np, u32 id, const char *map_name, const char *map_mask_name, - struct device_node **target, u32 *id_out); + const struct device_node *filter_np, struct of_phandle_args *arg); =20 int of_map_iommu_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out); + struct of_phandle_args *arg); =20 int of_map_msi_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out); + const struct device_node *filter_np, struct of_phandle_args *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -935,19 +935,21 @@ static inline void of_property_clear_flag(struct prop= erty *p, unsigned long flag =20 static inline int of_map_id(const struct device_node *np, u32 id, const char *map_name, const char *map_mask_name, - struct device_node **target, u32 *id_out) + const struct device_node *filter_np, + struct of_phandle_args *arg) { return -EINVAL; } =20 static inline int of_map_iommu_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out) + struct of_phandle_args *arg) { return -EINVAL; } =20 static inline int of_map_msi_id(const struct device_node *np, u32 id, - struct device_node **target, u32 *id_out) + const struct device_node *filter_np, + struct of_phandle_args *arg) { return -EINVAL; } --=20 2.34.1 From nobody Thu Apr 9 13:33:31 2026 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; dmarc=pass(p=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1775642721; cv=none; d=zohomail.com; s=zohoarc; b=ImDUIRJ4jnaUnKGSXj8YZgxSaXtqAxybymK2/Yj74pN8jvpIuSetYHScnkDfTX1WaZo2OPOdTa+LolMy/AbozplUBGqVBjUl8DAZ4SIcbhiU6QDvjkA+q+zuJo7rtv1KXK1fT5eUBniwxKTm7r90tWVi0JtkAc7jA0M/na/PupI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775642721; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fOXXFN9mhZ7JxzI+hTQo1c6CYH+05MRwTlhFigPlnEI=; b=OkZR5GV44ZKePP2UDDLfo5Z1NJFoSREarbDrFGwxegcvU3XH7KrUPyyz9dFnE1b8BVwYY08Ofi5UWHxLCC6U/Y1SQwBOnRw5ssnMeeykEP2NvNYKR/X275jRoNfR2QwbcPktcpReXH3AlD7mxJEGWWdlnDY62Jwdq0/jpXFXhTc= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1775642721738991.571347416246; Wed, 8 Apr 2026 03:05:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1275597.1561382 (Exim 4.92) (envelope-from ) id 1wAPmM-0006E6-3U; Wed, 08 Apr 2026 10:04:58 +0000 Received: by outflank-mailman (output) from mailman id 1275597.1561382; Wed, 08 Apr 2026 10:04:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPmM-0006Dz-0Z; Wed, 08 Apr 2026 10:04:58 +0000 Received: by outflank-mailman (input) for mailman id 1275597; Wed, 08 Apr 2026 10:04:56 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wAPmJ-0006DS-TK for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 10:04:56 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wAPmJ-007JgT-9H for xen-devel@lists.xenproject.org; Wed, 08 Apr 2026 12:04:55 +0200 Received: from [10.42.69.12] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d62834-bab6-0a2a0a5309dd-0a2a450ce9d2-0 for ; Wed, 08 Apr 2026 12:04:36 +0200 Received: from [205.220.168.131] (helo=mx0a-0031df01.pphosted.com) by tlsNG-d25034.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d62820-f40c-0a2a450c0019-cddca8832f48-3 for ; Wed, 08 Apr 2026 12:04:18 +0200 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6385WD1b1006023 for ; Wed, 8 Apr 2026 10:04:16 GMT Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dd7tpaqdy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Apr 2026 10:04:16 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-82c646e980bso3136999b3a.0 for ; Wed, 08 Apr 2026 03:04:16 -0700 (PDT) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b5fb22sm25805584b3a.26.2026.04.08.03.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 03:04:14 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=qcppdkim1 header.d=qualcomm.com header.i="@qualcomm.com" header.h="Cc:Content-Transfer-Encoding:Content-Type:Date:From:In-Reply-To:Message-Id:MIME-Version:References:Subject:To"; dkim=pass header.s=google header.d=oss.qualcomm.com header.i="@oss.qualcomm.com" header.h="Cc:To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding:MIME-Version:Subject:Date:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= fOXXFN9mhZ7JxzI+hTQo1c6CYH+05MRwTlhFigPlnEI=; b=pMZPZKCo75OvsLso d9DPZFL3vc8yVgEVCwLlGHiqOMFIqILxswpmIsseKtSgLpSsmWLenSfjDIc4ws6G eGJNHOkLGFAG2sbF5UA0EV4mr6wiXjL0PsTvNuVsnTlJr9tGWike6QP0Abz3Mp3K buYfJvEDdLkDQtnP4mokOvpFZxvJZYeDlUNDdSaLBdbQRr25ah4tgvr6FpjOr5nH HlU6mnURWxleTTGrBlFmhtavAfK8U61f3UTpCrLzGVUrxrkXkn/Rzfc5o8cs2V6f Iv4eR82dCqRZ9zJTtKcKRSpbMm/EOwU0d4YQlCtG07pZOeVA6jB/lSRMTnWT8SfA b8nmaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1775642655; x=1776247455; darn=lists.xenproject.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fOXXFN9mhZ7JxzI+hTQo1c6CYH+05MRwTlhFigPlnEI=; b=kDJXMFyFkyYNcqd3V4kA6oz9XglN26aNypv6axnvSwGVvsKArckVeJQ7p4gW/S71U0 +MCrh8iCUp2q0ffwcZNmBrZOQJTA+82ke56qZGDaGxLD29q5j46EConOSnsw+mVQRfnQ MpP6eAjAmZcq4JDAGjQJO3ZTLGC+jwqSuIqVpIhO673o3CQGPGDH5eGQ/Lj2vTzIDAPz +r+DgiVU5hS4mS/qpx9a6v7mKuRbGokibpMMcyZhLsF0odQNuk9mSFwHXhdK6oNEL6Jm lEXxHh8qKQBu19rMEZvpZsh4cW4oQucbP9uX+BZ3bNwllq4Cjbn72lWaqWS334/FXwsn dAyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775642655; x=1776247455; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=fOXXFN9mhZ7JxzI+hTQo1c6CYH+05MRwTlhFigPlnEI=; b=MZSq8DXuvbgKmDQxroszU+Z+9OFmzwy8VzwkXq9IZ3JQ1uDUcQ3QVK2guGFGTgw15f QwfdRtY4cmYA0ErHm+mX8CDTGHz+B6Fk7DivHAmIMpNKpb8kIZdkGjVzDOUd3gfa/WvK fqYf8RxGn5R3GmFHpxEpeXMcvoiyHxUXETkr3if27rS+Opqqv7QEO1FtCJE0jaYQLnSt zolIzTgY/U+6tAjATIUiddOZol2fiCwwlCJ39hB3dTSLAsPpEugjiWFdOLDD67SIq3a5 X/LFaGuZrgoo3cF54uL+UI7+PNiDWk6jpb+Zie3KyIDAcEn0lt8DsFImYBQNLV3LHw3/ vBxw== X-Forwarded-Encrypted: i=1; AJvYcCWwuFJdvnBX5KsK3iBxuTggqmkzTDFsLut12ykx7Jn2yg1GRQ9xpitK6NkQT2tX9IqqeIyDr+gPalA=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxaj+VmQd1FYPyKH7MF+poF8u0Pc3QnQBxzMMrEfcjLYO5g/TiV GGYJicfh3qstvaMxulE0JiNPp227Q13SW+Zi+4CHPwyD3/1Y328TxfTy1oFAhc34T/uFlweBJdO poe71V23TFAut6LJ2jeDpZq3hXa7BlgrQdD/NhR6PfotiQgS0xdEBlQOlqCp8mfV9jIvUcQ== X-Gm-Gg: AeBDietj0niRrnsaRjaUrOniKiJFyJ13+Ie8yO1GoME0ZjryWvdoHW8T/iTqavZD/LZ l0NRyXXOZ14ybr2E1ixfsL3O6Pi0frkkSYsdHsvLKk+n8Tj0JXLCovCzG1g0eqG5i9/OJRlZP72 gwKVfrWdarW482EcOshrEctuJPkh7AiBDIHaq4CLq/tCIVP3fmKsuaKtFNwkxNnOaKiePlgu207 5Fi+pkpHPGqcFQIcT5PKF7sQ647xdy8Gnufet8o9uyjhMam3rfrEk+7aXY4GGqTZebYPoZM2hZG S/Yl26jPCRpqVSQHEAy1xiQOXEr6RbK5rzJ0VqkLk3yn3rHZ9QWqvmgVf/fADpuRrLdDy8VrKrH w4WHdLO6c8lXUPGZrwuEwf5zk33SsmnjOP+jJrX1FVvzhdyAhl3lNpW3O X-Received: by 2002:a05:6a00:414b:b0:829:7a15:9b96 with SMTP id d2e1a72fcca58-82d0dbd3ad4mr20930784b3a.54.1775642655245; Wed, 08 Apr 2026 03:04:15 -0700 (PDT) X-Received: by 2002:a05:6a00:414b:b0:829:7a15:9b96 with SMTP id d2e1a72fcca58-82d0dbd3ad4mr20930728b3a.54.1775642654481; Wed, 08 Apr 2026 03:04:14 -0700 (PDT) From: Vijayanand Jitta Date: Wed, 08 Apr 2026 15:33:27 +0530 Subject: [PATCH v13 3/3] of: Respect #{iommu,msi}-cells in maps MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260408-parse_iommu_cells-v13-3-fa921e92661b@oss.qualcomm.com> References: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> In-Reply-To: <20260408-parse_iommu_cells-v13-0-fa921e92661b@oss.qualcomm.com> To: Nipun Gupta , Nikhil Agarwal , Joerg Roedel , Will Deacon , Robin Murphy , Marc Zyngier , Lorenzo Pieralisi , Thomas Gleixner , Saravana Kannan , Richard Zhu , Lucas Stach , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , Bjorn Helgaas , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dmitry Baryshkov , Konrad Dybcio , Bjorn Andersson , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Prakash Gupta , Vikash Garodia Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, imx@lists.linux.dev, xen-devel@lists.xenproject.org, linux-arm-msm@vger.kernel.org, Vijayanand Jitta , Charan Teja Kalla X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1775642611; l=12022; i=vijayanand.jitta@oss.qualcomm.com; s=20260301; h=from:subject:message-id; bh=d1eDTLSvaaoV8Pjb6ssN/wlaFmWHAsxlhBaIWB039ns=; b=Qz9Bew7teeuYpMRibThlE+2spUrFr6YAsTdYy+DdombPTIwVDXiEwEkO1fgZ/TZdvZ2d817JE fJz68Xogd71BSLUNzAZKADh171mv0irdXgfbICdZqYgPzhVLjuc2+8p X-Developer-Key: i=vijayanand.jitta@oss.qualcomm.com; a=ed25519; pk=Lpi7Cs3wHe8KZtqvyci7FTOLzsKpEHKGCaPNZw+1zRI= X-Proofpoint-GUID: hMGCanpU5PH0PNdHNHlKo_Dsf1RuNZnu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDA4MDA5MSBTYWx0ZWRfX/CyDT3WwlWj2 rGxKLeqXsmoVYlQIl7DEZEA0QnRj2bHAVJFPggsgVd/JwDpOoEUAEReVxnipDEzNG30WUqaeiPF rybvQKPn72ID7xL/F7qaYL2/0KfkFBgAUj9QmsfIeidzin6sbQq/Fd59C0K4XPQqmpmb8VpHDDQ yKffM7thprAhsfO6DOaHQBYaW1mcgUF/RIerhYbYn2cyBUzQ3qHQ+VSPiHV/hDNbIk0zi2Ffw1o cE8tcsn80tya+EDR/EKldgU/zvdLCyzrRcN7Op5Kjf0+G0z7I8lJy1D0ICjP1czPxyOZ7Mm4rxg msyRM0eJqvZtMe7eUZpsv5bJByZFo/FVFmnYlybQcjPY8U5BYaFuBURwcd2Edct8dga6wTzgpsy EM83iNWgdk2ttGus7j7QL41Ci7lMf6Ee8Xl3MtAc0QAYkrhIUYO0zm5b/Rja5ilw6vTvoaQdZva Yh//AMaMH+yJw3Mqhbg== X-Proofpoint-ORIG-GUID: hMGCanpU5PH0PNdHNHlKo_Dsf1RuNZnu X-Authority-Analysis: v=2.4 cv=DNS/JSNb c=1 sm=1 tr=0 ts=69d62820 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=klF1l1D6msg2vEcBgDUA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-08_03,2026-04-08_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 bulkscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604080091 X-purgate-ID: tlsNG-d25034/1775642658-FDD53A3D-3874DBFC/0/0 X-purgate-type: clean X-purgate-size: 12069 X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1775642723861154100 From: Robin Murphy So far our parsing of {iommu,msi}-map properties has always blindly assumed that the output specifiers will always have exactly 1 cell. This typically does happen to be the case, but is not actually enforced (and the PCI msi-map binding even explicitly states support for 0 or 1 cells) - as a result we've now ended up with dodgy DTs out in the field which depend on this behaviour to map a 1-cell specifier for a 2-cell provider, despite that being bogus per the bindings themselves. Since there is some potential use in being able to map at least single input IDs to multi-cell output specifiers (and properly support 0-cell outputs as well), add support for properly parsing and using the target nodes' #cells values, albeit with the unfortunate complication of still having to work around expectations of the old behaviour too. Since there are multi-cell output specifiers, the callers of of_map_id() may need to get the exact cell output value for further processing. Update of_map_id() to set args_count in the output to reflect the actual number of output specifier cells. Signed-off-by: Robin Murphy Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/of/base.c | 157 +++++++++++++++++++++++++++++++++++++++++--------= ---- include/linux/of.h | 6 +- 2 files changed, 125 insertions(+), 38 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index b3d002015192..2554e4f1a181 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2096,18 +2096,48 @@ int of_find_last_cache_level(unsigned int cpu) return cache_level; } =20 +/* + * Some DTs have an iommu-map targeting a 2-cell IOMMU node while + * specifying only 1 cell. Fortunately they all consist of value '1' + * as the 2nd cell entry with the same target, so check for that pattern. + * + * Example: + * IOMMU node: + * #iommu-cells =3D <2>; + * + * Device node: + * iommu-map =3D <0x0000 &smmu 0x0000 0x1>, + * <0x0100 &smmu 0x0100 0x1>; + */ +static bool of_check_bad_map(const __be32 *map, int len) +{ + __be32 phandle =3D map[1]; + + if (len % 4) + return false; + for (int i =3D 0; i < len; i +=3D 4) { + if (map[i + 1] !=3D phandle || map[i + 3] !=3D cpu_to_be32(1)) + return false; + } + return true; +} + /** * of_map_id - Translate an ID through a downstream mapping. * @np: root complex device node. * @id: device ID to map. * @map_name: property name of the map to use. + * @cells_name: property name of target specifier cells. * @map_mask_name: optional property name of the mask to use. * @filter_np: optional device node to filter matches by, or NULL to match= any. * If non-NULL, only map entries targeting this node will be matched. * @arg: pointer to a &struct of_phandle_args for the result. On success, - * @arg->args[0] will contain the translated ID. If a map entry was - * matched, @arg->np will be set to the target node with a reference - * held that the caller must release with of_node_put(). + * @arg->args_count will be set to the number of output specifier cells + * as defined by @cells_name in the target node, and + * @arg->args[0..args_count-1] will contain the translated output + * specifier values. If a map entry was matched, @arg->np will be set + * to the target node with a reference held that the caller must release + * with of_node_put(). * * Given a device ID, look up the appropriate implementation-defined * platform ID and/or the target device which receives transactions on that @@ -2116,17 +2146,19 @@ int of_find_last_cache_level(unsigned int cpu) * Return: 0 on success or a standard error code on failure. */ int of_map_id(const struct device_node *np, u32 id, - const char *map_name, const char *map_mask_name, + const char *map_name, const char *cells_name, + const char *map_mask_name, const struct device_node *filter_np, struct of_phandle_args *arg) { u32 map_mask, masked_id; - int map_len; + int map_bytes, map_len, offset =3D 0; + bool bad_map =3D false; const __be32 *map =3D NULL; =20 if (!np || !map_name || !arg) return -EINVAL; =20 - map =3D of_get_property(np, map_name, &map_len); + map =3D of_get_property(np, map_name, &map_bytes); if (!map) { if (filter_np) return -ENODEV; @@ -2136,11 +2168,9 @@ int of_map_id(const struct device_node *np, u32 id, return 0; } =20 - if (!map_len || map_len % (4 * sizeof(*map))) { - pr_err("%pOF: Error: Bad %s length: %d\n", np, - map_name, map_len); - return -EINVAL; - } + if (map_bytes % sizeof(*map)) + goto err_map_len; + map_len =3D map_bytes / sizeof(*map); =20 /* The default is to select all bits. */ map_mask =3D 0xffffffff; @@ -2153,39 +2183,84 @@ int of_map_id(const struct device_node *np, u32 id, of_property_read_u32(np, map_mask_name, &map_mask); =20 masked_id =3D map_mask & id; - for ( ; map_len > 0; map_len -=3D 4 * sizeof(*map), map +=3D 4) { + + while (offset < map_len) { struct device_node *phandle_node; - u32 id_base =3D be32_to_cpup(map + 0); - u32 phandle =3D be32_to_cpup(map + 1); - u32 out_base =3D be32_to_cpup(map + 2); - u32 id_len =3D be32_to_cpup(map + 3); + u32 id_base, phandle, id_len, id_off, cells =3D 0; + const __be32 *out_base; + + if (map_len - offset < 2) + goto err_map_len; + + id_base =3D be32_to_cpup(map + offset); =20 if (id_base & ~map_mask) { - pr_err("%pOF: Invalid %s translation - %s-mask (0x%x) ignores id-base (= 0x%x)\n", - np, map_name, map_name, - map_mask, id_base); + pr_err("%pOF: Invalid %s translation - %s (0x%x) ignores id-base (0x%x)= \n", + np, map_name, map_mask_name, map_mask, id_base); return -EFAULT; } =20 - if (masked_id < id_base || masked_id >=3D id_base + id_len) - continue; - + phandle =3D be32_to_cpup(map + offset + 1); phandle_node =3D of_find_node_by_phandle(phandle); if (!phandle_node) return -ENODEV; =20 + if (bad_map) { + cells =3D 1; + } else if (of_property_read_u32(phandle_node, cells_name, &cells)) { + pr_err("%pOF: missing %s property\n", phandle_node, cells_name); + of_node_put(phandle_node); + return -EINVAL; + } + + if (map_len - offset < 3 + cells) { + of_node_put(phandle_node); + goto err_map_len; + } + + if (offset =3D=3D 0 && cells =3D=3D 2) { + bad_map =3D of_check_bad_map(map, map_len); + if (bad_map) { + pr_warn_once("%pOF: %s mismatches target %s, assuming extra cell of 0\= n", + np, map_name, cells_name); + cells =3D 1; + } + } + + out_base =3D map + offset + 2; + offset +=3D 3 + cells; + + id_len =3D be32_to_cpup(map + offset - 1); + if (id_len > 1 && cells > 1) { + /* + * With 1 output cell we reasonably assume its value + * has a linear relationship to the input; with more, + * we'd need help from the provider to know what to do. + */ + pr_err("%pOF: Unsupported %s - cannot handle %d-ID range with %d-cell o= utput specifier\n", + np, map_name, id_len, cells); + of_node_put(phandle_node); + return -EINVAL; + } + id_off =3D masked_id - id_base; + if (masked_id < id_base || id_off >=3D id_len) { + of_node_put(phandle_node); + continue; + } + if (filter_np && filter_np !=3D phandle_node) { of_node_put(phandle_node); continue; } =20 arg->np =3D phandle_node; - arg->args[0] =3D masked_id - id_base + out_base; - arg->args_count =3D 1; + for (int i =3D 0; i < cells; i++) + arg->args[i] =3D id_off + be32_to_cpu(out_base[i]); + arg->args_count =3D cells; =20 pr_debug("%pOF: %s, using mask %08x, id-base: %08x, out-base: %08x, leng= th: %08x, id: %08x -> %08x\n", - np, map_name, map_mask, id_base, out_base, - id_len, id, masked_id - id_base + out_base); + np, map_name, map_mask, id_base, be32_to_cpup(out_base), + id_len, id, id_off + be32_to_cpup(out_base)); return 0; } =20 @@ -2196,6 +2271,10 @@ int of_map_id(const struct device_node *np, u32 id, arg->args[0] =3D id; arg->args_count =3D 1; return 0; + +err_map_len: + pr_err("%pOF: Error: Bad %s length: %d\n", np, map_name, map_bytes); + return -EINVAL; } EXPORT_SYMBOL_GPL(of_map_id); =20 @@ -2205,18 +2284,21 @@ EXPORT_SYMBOL_GPL(of_map_id); * @id: Requester ID of the device (e.g. PCI RID/BDF or a platform * stream/device ID) used as the lookup key in the iommu-map table. * @arg: pointer to a &struct of_phandle_args for the result. On success, - * @arg->args[0] contains the translated ID. If a map entry was matched, - * @arg->np holds a reference to the target node that the caller must - * release with of_node_put(). + * @arg->args_count will be set to the number of output specifier cells + * and @arg->args[0..args_count-1] will contain the translated output + * specifier values. If a map entry was matched, @arg->np holds a + * reference to the target node that the caller must release with + * of_node_put(). * - * Convenience wrapper around of_map_id() using "iommu-map" and "iommu-map= -mask". + * Convenience wrapper around of_map_id() using "iommu-map", "#iommu-cells= ", + * and "iommu-map-mask". * * Return: 0 on success or a standard error code on failure. */ int of_map_iommu_id(const struct device_node *np, u32 id, struct of_phandle_args *arg) { - return of_map_id(np, id, "iommu-map", "iommu-map-mask", NULL, arg); + return of_map_id(np, id, "iommu-map", "#iommu-cells", "iommu-map-mask", N= ULL, arg); } EXPORT_SYMBOL_GPL(of_map_iommu_id); =20 @@ -2229,17 +2311,20 @@ EXPORT_SYMBOL_GPL(of_map_iommu_id); * to match any. If non-NULL, only map entries targeting this node will * be matched. * @arg: pointer to a &struct of_phandle_args for the result. On success, - * @arg->args[0] contains the translated ID. If a map entry was matched, - * @arg->np holds a reference to the target node that the caller must - * release with of_node_put(). + * @arg->args_count will be set to the number of output specifier cells + * and @arg->args[0..args_count-1] will contain the translated output + * specifier values. If a map entry was matched, @arg->np holds a + * reference to the target node that the caller must release with + * of_node_put(). * - * Convenience wrapper around of_map_id() using "msi-map" and "msi-map-mas= k". + * Convenience wrapper around of_map_id() using "msi-map", "#msi-cells", + * and "msi-map-mask". * * Return: 0 on success or a standard error code on failure. */ int of_map_msi_id(const struct device_node *np, u32 id, const struct device_node *filter_np, struct of_phandle_args *arg) { - return of_map_id(np, id, "msi-map", "msi-map-mask", filter_np, arg); + return of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", filter_= np, arg); } EXPORT_SYMBOL_GPL(of_map_msi_id); diff --git a/include/linux/of.h b/include/linux/of.h index 8548cd9eb4f1..51ac8539f2c3 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -462,7 +462,8 @@ const char *of_prop_next_string(const struct property *= prop, const char *cur); bool of_console_check(const struct device_node *dn, char *name, int index); =20 int of_map_id(const struct device_node *np, u32 id, - const char *map_name, const char *map_mask_name, + const char *map_name, const char *cells_name, + const char *map_mask_name, const struct device_node *filter_np, struct of_phandle_args *arg); =20 int of_map_iommu_id(const struct device_node *np, u32 id, @@ -934,7 +935,8 @@ static inline void of_property_clear_flag(struct proper= ty *p, unsigned long flag } =20 static inline int of_map_id(const struct device_node *np, u32 id, - const char *map_name, const char *map_mask_name, + const char *map_name, const char *cells_name, + const char *map_mask_name, const struct device_node *filter_np, struct of_phandle_args *arg) { --=20 2.34.1