From nobody Mon Feb 9 21:37:46 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CFD8425CC7 for ; Wed, 21 Jan 2026 05:54:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768974874; cv=none; b=LVVpdgu0bUJ3SRq7pA0BzJNtnuV/lMI/CNnRCf+5vHmkqEFpwZRBC+8PQBI+z3TXLkTrP5tQEWOfyQD3NmTEGCNKEiKa6KZDyNrfLiKGjqjfJtZWdXl2Js1SgyIGkn2qUJQ6HpEv3DbYShr2Se1ipcz1Xzqf2ZbVWuZCRNu0VaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768974874; c=relaxed/simple; bh=ZXUiTl4+2nF18kNLH5IJnoSTF9D9+5pWu6v1dqL2crI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nZSGAINEKoI1tyOzLRKZFBCvU+SQieW8oxB8PmB+qb3nYzO2hNiAKVOBWSP2L3UXRXN8Vef9S8yp7mfa3/w5rHXOU+Xr7wPlJWV8g2OVvEiJhOML4u3Nz25pUzolzzXbWx6vJyrl5BxSMzbQqdtBNYrXdMkDd3kIAVXXldNrqU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=nyE8Ft1u; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BJF5bL7y; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="nyE8Ft1u"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BJF5bL7y" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60L5HIRY385665 for ; Wed, 21 Jan 2026 05:54:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=uMbzqoMsnSD IM7szmbD2+8L3whOzIkWXJhIlQStUWFE=; b=nyE8Ft1uSqLFegiuBP881seA9mF Mr5nWOJ4u7pNaGvP9bXlkhgyBHQC+oMR1NM0UX3a7xH5MAGp+2hjYZvbfr3cpmmf EZ28VlfZiQMdF6pIyjmZo7CyQ6VXGWH22LB3+BmE7vYcocH835upHDfJmi+XBhz1 kL7vihwlhe8YGDtY/coobYgPF61jx2eKyRl0J85ir1ehVToIV+kOwbcUwTLcr5iM evr/KZwBnYsGC0T4Xttrkmy7QVDYuKvMGYsrFBn5gkImNsG2Ok5WweL9W6TCdtbU x9LBonSGavI9QQ00krjqfHAjqNj58sk7jn5/G6N8C2IU27Hf1NUjtWttR9A== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bta7qb8r7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 21 Jan 2026 05:54:31 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-81efa628efbso5430047b3a.1 for ; Tue, 20 Jan 2026 21:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768974871; x=1769579671; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uMbzqoMsnSDIM7szmbD2+8L3whOzIkWXJhIlQStUWFE=; b=BJF5bL7y6tS6W+oX1Rmeu45hJs30q+1dpqYRikAF2GvScLU9wWcn+MDYJUrd+94CMa L5++pV+fgKUrYbisyEEAgV9Wuv0b3PrzNASvJvWg/LQlY6mtUBmGIjNJrMRqn3juMOjw CgCUT3XJl1w8gG/K8eBGeAZeAzNOdzSAAXdRZkyWFlzDv7/HgVri8h2iqSiiY1YJguGT zkfrwzshn+leMCGYv7vFREEcZ8OZKVD3/K9tcpmQ3F/d+QBcA8dJwtIvmHsxTJUcxatO Y7xGHldG2MQUdRK4kIfGjTHuMu80T4JVUtyIpcBTLgQxG5vbVg+GtJ3MoPPcki+6f3dQ vYFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768974871; x=1769579671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uMbzqoMsnSDIM7szmbD2+8L3whOzIkWXJhIlQStUWFE=; b=KwaNFsJW1ORaPzXgO2o/tCU6VWgX8DCMkCPSEZzOFC8gtqDyfar0wli1YRBwvMJYJO AFRs/JAHAg2NPkBzc6W33kZ99PyIziNLniagrUPP76y23hJThXYgTI2m1d+gsXqnM2ho /wqrnvHw1XeTaiAmCLN/U+v7kGXoQ0uzDx25Tttd6+GJ/fwEFJI8LANoE8gz3fBD20rb 7fwZ1+HsQt1GeEPgyxRen9I7KFyvQpdqHS7T8RpcVlYlwt2P+LfHQUODbApwzfNgtapa 8FKlQ3EoGUZXhjQTV2yZohQ5mVT0RZZsku9RgzhdocQ5XkWPfr4cs7UqRKNk6QzW2CWt JyrQ== X-Forwarded-Encrypted: i=1; AJvYcCUCdZHodc0lF0ei1d4TAjVzYHXnCK3xvQ/h6zF605sd113vC9VtXeJ2wWLyqqP/2GdxRsWlZaj3W55xzCM=@vger.kernel.org X-Gm-Message-State: AOJu0Yyb/JjrBeUDf8hsAlzXQJME1w7GKdJFB1Wvo30iATtNOeXDUCjq pqQDwuTiPMoLfEp91e2QLJNueGWrX33MSul0fVANXpdiMMGqZNEfvUGs+FK/odKwP7EuvSxIDV9 t2pF8eVBGqtDXOEHT0pSTTc1mynqdbsA917/5mmM3cE6R+Zth7BPVXDAHMV9tRKwf/fg= X-Gm-Gg: AZuq6aKT24Kk0Tnp3vebHkBOIiKmtMvQFjP5wUxRichwqboGXdwgfPbO0yi96df40E+ AV7MN8nH4ULb1bKfK0w1x86R9XcPc3HQy8Z1JobDxQ0JY+hwJPHtYVYogKotGeT4EHONMahwEva h5uFjTJrqCYbTeL+kHqueiANrZxEvgng4dukBcci/63HHf9znqZSj3RhI/3GGhGVaysmPviigq8 Ymw2oeFrCDHhyiGxhQv11CjwYkMbPhrSJJPEaVw+nblMB77nEVAgbhW865hufGLscrsSXMAKthk ZOT5YGul3gvyp+2q5yETkZttw4vYwHdP8EgKyJbcrUBN5V1ZBsFv1jCOg51Lam5Gkbh1dJy+0oa q7XjpDtS/HFFl7PsliKrm37Hrt8pcdhVOIRccgWDo+a69 X-Received: by 2002:a05:6a00:1805:b0:81f:5acb:55e5 with SMTP id d2e1a72fcca58-81fa1771fdbmr12076110b3a.2.1768974870728; Tue, 20 Jan 2026 21:54:30 -0800 (PST) X-Received: by 2002:a05:6a00:1805:b0:81f:5acb:55e5 with SMTP id d2e1a72fcca58-81fa1771fdbmr12076083b3a.2.1768974870203; Tue, 20 Jan 2026 21:54:30 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-81fa1278061sm13831927b3a.44.2026.01.20.21.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 21:54:29 -0800 (PST) From: Vijayanand Jitta To: robin.murphy@arm.com, will@kernel.org, joro@8bytes.org, robh@kernel.org, dmitry.baryshkov@oss.qualcomm.com, konrad.dybcio@oss.qualcomm.com, bjorn.andersson@oss.qualcomm.com, bod@kernel.org, conor+dt@kernel.org, krzk+dt@kernel.org, prakash.gupta@oss.qualcomm.com, vikash.garodia@oss.qualcomm.com Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Frank Li , Vijayanand Jitta Subject: [PATCH v6 1/3] of: Add convenience wrappers for of_map_id() Date: Wed, 21 Jan 2026 11:23:58 +0530 Message-Id: <20260121055400.937856-2-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260121055400.937856-1-vijayanand.jitta@oss.qualcomm.com> References: <20260121055400.937856-1-vijayanand.jitta@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: NyILblSBwQurFD5IE5DKx3W4NMJVGASz X-Proofpoint-ORIG-GUID: NyILblSBwQurFD5IE5DKx3W4NMJVGASz X-Authority-Analysis: v=2.4 cv=LPBrgZW9 c=1 sm=1 tr=0 ts=69706a17 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7CQSdrXTAAAA:8 a=VwQbUJbxAAAA:8 a=8AirrxEcAAAA:8 a=EUspDBNiAAAA:8 a=wrOk0Nx1w3hKWqktZycA:9 a=IoOABgeZipijB_acs4fv:22 a=a-qgeE7W1pNrGK8U0ZQC:22 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIxMDA0NiBTYWx0ZWRfXzxG38WUqqufV Qiwpnt1Pt4zyFqQ43grWJ1G3fFRg1Cc3sAxMLWfZf3oiE51hWkS4WRgPq/JQkV7Js7JQkWdKKLw KO49KsL2wdVtEzxdTJARbnJCszmpfNxlS4d7xmxf1+RpXIR63T+hbqiFD3QS2UaoiWw9uuEVzCw RTmbbhQDhpB8Hxp4PEGeFAcMSjZiTqlvvpLVv4od+Dg0uzVxXU9Qf59YsFveUOKVE6CsCRZiSZa yaoHSHmOUC20PU8DTSFSMJu5TOZY1IhPehMJ5cfKa6w9zL1vjNHgJyjyu0r3Wid67+YgXMaW+YJ d7A7DYMRgNGOgEwSAbmiNR1keDwVmMCFIR1+PZTFWhH7sv3C757EPjA8jvlp2RPT6/muQLzctge +aULv3gLaT7LDlxaHkue8PKWt3Q/ttzwvIUtvDqbNRmbOl2W0KTpHtRixcTkW4ulQ4OaXP2Nf/9 WCas+xFe6BjDFcXxxdw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.20,FMLib:17.12.100.49 definitions=2026-01-21_01,2026-01-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 malwarescore=0 priorityscore=1501 adultscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601210046 Content-Type: text/plain; charset="utf-8" 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 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/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 | 14 ++++++++++++++ 8 files changed, 22 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 12f45228c867..d5d8fa65c24d 100644 --- a/drivers/irqchip/irq-gic-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-its-msi-parent.c @@ -173,7 +173,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 int __weak iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index f374d8b212b8..ddd046de70de 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 1d8677d7de04..c3e5cb3cb846 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1143,8 +1143,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 { @@ -1157,8 +1156,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 9bbdcf25a2b4..309c5681744b 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1457,6 +1457,20 @@ static inline int of_property_read_s32(const struct = device_node *np, return of_property_read_u32(np, propname, (u32*) out_value); } =20 +static inline 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); +} + +static inline 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); +} + #define of_for_each_phandle(it, err, np, ln, cn, cc) \ for (of_phandle_iterator_init((it), (np), (ln), (cn), (cc)), \ err =3D of_phandle_iterator_next(it); \ --=20 2.34.1