From nobody Thu Apr 9 15:01:25 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