From nobody Thu Apr 16 19:11:19 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 CC232344040 for ; Thu, 26 Feb 2026 07:46:03 +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=1772091965; cv=none; b=CmGk43D0ZL6q1K6yi3dMUxocFrMVBah+0O7E8eZAwD42w4JZNXj+bxdH3Z0/VPPi3JEC+gJHDEUKByTbwBNQsVMbwZtfLTCZPTPXmbjRZo5QI1q1gegWdwNg7MGZdLZ91kFRO2D0+wd/iSxgvyT8ulCG5uzkA7vhLH/wt6tLq+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772091965; c=relaxed/simple; bh=62wE/dFO70wWM6jtNkIEjSDoZ/uTZDrsSnyLOGNH7AU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DzJBqGUEnXBd1yHfDxiKs5P8x/rsFWgRVb8vXNWzG124LeJ6zpCrJlVSO7XofPYnw6Y2vv3VVM8cMAX9puMMT6FkGMGFA4i0anGyxlcZvr3scBqCAi3+IxulZUBtXPuvUsu/rFrRVIj5oKxd1gyYZ/L+wPxq1pQM2k1bElG4pqM= 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=IW0q/1uD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=jG1EnxYo; 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="IW0q/1uD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="jG1EnxYo" 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 61Q4VS63576525 for ; Thu, 26 Feb 2026 07:46:03 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=3ukvPHoLd8R ybKSkJJjyIW6Pfs0lLwz5oAOgnyruNtE=; b=IW0q/1uDqozaEB2pNJp3g6FmrC4 4o8gO7pSyiLjonm0Ikk04N+r+/y/v74T+/IouunKq0c+ZVsi288jhtbQ4LGID59k 2Ssi9Am1kB/EUAKtgl5I8wNaMK4a/iNdbzrrOlQq+zFj4MOJi2fl1tbUFMzkfe0g WDOGplxR9zq6JIDszGj7ivT9elohQar60gPyGKDkM/xeo0bFbBWmuIqLkFn3R9oY kZgG2GiZyPJ0IMCIX6pgq+6UO6grsI49CAZi8FcwzpUTRKzDe0cTDgOFaWUaDxP8 O2YrvePD6xky8wJcxSiUdRGvSHEtWZGzLwX+cZKNnPRDGTz+pwX/AjFOcKQ== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cj350jr2v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 26 Feb 2026 07:46:02 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-358df8fbd1cso573608a91.0 for ; Wed, 25 Feb 2026 23:46:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772091962; x=1772696762; 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=3ukvPHoLd8RybKSkJJjyIW6Pfs0lLwz5oAOgnyruNtE=; b=jG1EnxYoS/RrJkQTcVX8UIRLhbNflAISi7mcz5RoZucdyKWAkOJWC+oUaltRo+aLMj PfTLuTIxrN1fLYmiS3IDm0Rqwrg8ZliefWbRTAvMW9WkNOygvtnyqbop7CTOuWNGX+zy QxXr6TgpY5nlcjaqzx6Kk/2Cojqp+LpXtrIb0hRDWhayKNMC4Gyw6AUMj5pzfH+7Z8Wn YlLlGYUCzplfGQ8I9dalUXHrmXs89JEbjDOLjsZrtzF2+EoRLxmW/hDF3fDAejw6PSyS 1sTM9xzo9F3PQAiRBSobRQz8WgbE1nbr+hN6HIHSJBs6VAIzl9d5YfihD//6Qj7w0cBy +zzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772091962; x=1772696762; 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=3ukvPHoLd8RybKSkJJjyIW6Pfs0lLwz5oAOgnyruNtE=; b=JA4n31FFYdMxMZ6U9/EbVwBPackshevdoIaCOSYSC2aaabn2bmrGzijgaAFbmRMGP3 4QyQZg2pgSSLhcbi7LAZI2ESBJU/1sWAv5VDJY3lP7KPQbIVWQuaAR5JGVxTfOEDcp/Z 5rk7PCvyccr4IzldjWU9sdsoazUVYb/rDG0wMy//UPqqg9EZtknH3jDCHDuV9zuHLSH1 y4y4zjD9z3FomHFLID5B8+MvGuoBC7hOfWQUHLqX6LI+YnQjDLt8qSnj/Qy4+u7fDfGp MEOGP882dwnnVUMEq0q3je1TL1EnXTgwTKAh1t5zYGqNtU3cZJSWUSfTnVfPk3M5ewxH UqWQ== X-Forwarded-Encrypted: i=1; AJvYcCVTuCWpuQeYqh+GY2xTq6YlQd+flBFGiD2ENBCTipFa767fIFQeTP1UoguLHh0zEudFSJzGLurWIwnNTig=@vger.kernel.org X-Gm-Message-State: AOJu0YyxCyXKdaJHcM0XKeG0n/J4o7xPJLH+b3Lzo173L9My9X7QC1Q5 9Wa1Po6FuxKXhppNFUmrHn+KchQvhgjeB1FPD14y1Agwjt2+nyvHfEiQxr6feR3Nq5gPgnEU3Wg cb5YGJQz81C1pFN1I3Xx7LYyO1UY4m5n4H8FW01KBt/109dGeNESL6nJ7yrGQMPPhhrg= X-Gm-Gg: ATEYQzy4374RtSMNrLy3g2nHqHZ5CKAx5e1w+ScOaKEV+281592sc32LnJ9bd6rCcDn x4Wud6egSqHiY5EaOTP5zKNCkSsnAapnBDdO375U0XzD5ouBiHZBhqRh1C7rAZrtAnFeckmFR7S p4UjnkgdjVkEqcZGMTHkzqtcJejyM1NDI7hgdUROaUjoHB7axlpTrt3XSSFUHC2xiQaMJ8CWGrf /MSVP4db/J86uIvdH8H8+fkQ+N/pB/IVsEdDi52ByF0jlcIbkW2eXtdDnn6pMpRB/0jQb9GbIwI Jk24Sru7omdsKjLJiKpdmCqgNqDbzEVr0XC9Otty3OrJpt4nrV2SW8skkK6Zm6eG3M4Ty0b0Fi2 2PFr42y2yi2aNUr0sZZyUKmMLAWgNKcH0G4vn4GFWGJ9sSs68udrx+SkJ X-Received: by 2002:a17:90b:2681:b0:359:2099:da20 with SMTP id 98e67ed59e1d1-3593dba14a9mr1911852a91.17.1772091962074; Wed, 25 Feb 2026 23:46:02 -0800 (PST) X-Received: by 2002:a17:90b:2681:b0:359:2099:da20 with SMTP id 98e67ed59e1d1-3593dba14a9mr1911818a91.17.1772091961569; Wed, 25 Feb 2026 23:46:01 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359034bbfd4sm4891168a91.10.2026.02.25.23.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 23:46:01 -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: [RESEND,v8 1/3] of: Add convenience wrappers for of_map_id() Date: Thu, 26 Feb 2026 13:12:43 +0530 Message-Id: <20260226074245.3098486-2-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com> References: <20260226074245.3098486-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: W37Ny-Bpf_m7iPY5g8f-h9Uk34KugC-Z X-Authority-Analysis: v=2.4 cv=Zs/g6t7G c=1 sm=1 tr=0 ts=699ffa3a cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=7CQSdrXTAAAA:8 a=VwQbUJbxAAAA:8 a=8AirrxEcAAAA:8 a=EUspDBNiAAAA:8 a=wrOk0Nx1w3hKWqktZycA:9 a=iS9zxrgQBfv6-_F4QbHw:22 a=a-qgeE7W1pNrGK8U0ZQC:22 a=ST-jHhOKWsTCqRlWije3:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI2MDA2OCBTYWx0ZWRfX8x1Gf6rnz7Lx CRuuFTWmqndAVUGxm9jzF9TRQZ+CJos2thPG1fjQeVvouMaIv3CwJfujl51ymN1CyJqSq1jYaWh iHC4WiamAQa7LKi0+TJykdje96EZfKWPubZP22DG3d6bqDez55UYu4S3YNvTIdRtacAXZ8v+75N 0h2r8PV9tKIl9E8r7vE/TClbpLJKgYsWVKLYQ3XXhj/FfuRwDTshOB8unRlAHa967zkhwG1nnsK 4/Daw09Wpc5+Y7DI5zqKQtWH1gtEPtuAYL3vg4pxLUXBoztaRycK8OCS/8+YQPfXA9JVyu+Xg3I OM6U5zPTasZnA29Ad5A+qah1nt0LV4S2TZDFRNqt24rA+YscQQa4KNmGSaq+ezbO4INPOqO7mxF 70+dDjabah9i614u2Mi2diZ3V4US0LKlkMrmMJb/7soi8UwNpApxgJIzoCF1VnVh5PHIE71aZjD s9J6oX4MhFvMJA+PezA== X-Proofpoint-ORIG-GUID: W37Ny-Bpf_m7iPY5g8f-h9Uk34KugC-Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-25_04,2026-02-25_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602260068 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 a832cdb2e697..b30d0dc0a1aa 100644 --- a/drivers/irqchip/irq-gic-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-its-msi-parent.c @@ -179,7 +179,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/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 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..824649867810 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 From nobody Thu Apr 16 19:11:19 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 DA64038F93A for ; Thu, 26 Feb 2026 07:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772091973; cv=none; b=hJUtz43uwZPUWq3qyoo1Sr6WgUz/TZIBCsCuMIBI6q0ncLolJPSB2a5vtO3N7CxhNNOcsq5haOtXdpXzq0UB+0gCVBBA0V3Q1WWx38/oXf/yZ6xYLBH9XZUwxH6pPRWNT4VhvWVPGLnC4WjD4xiu06/2rJ6J5d/qlvq7okkYgzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772091973; c=relaxed/simple; bh=g1haGOpzNTfZvxTfyS5r1B8gJFPHElbpXRDKtM7KpV0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BJkE7Se+Y8TOs+2Xk/mpWT+NFDk+i95nK8b+doZFPIFaXP9ngu5x33WbtLekjqQG7tSxr3ktKM3Az+ZtKuU3AFjnWNta62Y99sDclunl0xDJj624S5MUNDOyrI0LewZEdCF9zzslKkHAr9WCxQNhfNGKrNlSJSMIl1TtdFGBK3A= 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=eq6buWZA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=K4KmcUWB; arc=none smtp.client-ip=205.220.180.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="eq6buWZA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="K4KmcUWB" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61Q4VHMd350885 for ; Thu, 26 Feb 2026 07:46:09 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=ph+uPWKuRkv Wsmnv4xYT3GHGVLy8gBuWsg0hQehtf58=; b=eq6buWZAOK5sMi44cufphFRHVJg +IbtbJXz2xqaMWFOEdB3MY7S/DO7SWNOrfAu0BNwy4GkvDGzFokxrU5WhgzhUJXA 7xczJuwic0+DN1/40gNIqcDNO6xJoSmu+Gh5zI1ElFyrqW1tQc4vH7ViDWTNIs0u t3shixEsrTNERW2S1Ne/Rx7wXtO8qeDZOGvjkSf3wU+0HTvbg3A3wzk8GOvtJ7TC VN9lTm6MQ6Wb+HOhxaHppNNImzhl0nbcsKG28WgG4NlapM8g6ZA8x9PbPeec5smq efHJVBdKt+i6j6anNmYFJPJKo1YmJvzbMN7lUcU0CgQQjqrbLLlyJR1e0bQ== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cj54paa6r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 26 Feb 2026 07:46:09 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-b6ce1b57b9cso483316a12.1 for ; Wed, 25 Feb 2026 23:46:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772091968; x=1772696768; 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=ph+uPWKuRkvWsmnv4xYT3GHGVLy8gBuWsg0hQehtf58=; b=K4KmcUWBM2rSL/Rab/hOLKhjljbI+ewxAj7EJm0lDe1sE48PxxcwxJeeYzTA0vawLJ 5MP0iK9+IHMEtJciTDhKH/Kadp8/dyLblO5v49ESnxeg65HEnSP9G4lsbMqc89i/nfA3 JJgQQYDJ+OLjRc1REYCLPIjeDHBiwhNJTg3ZpTRZ6exdTxjB1oVCEO/tfHHvTf+ADDCv yFUIjtXEsGXVz3GN1Nq5d7l7qFcKRCDWW5C3JvxY78RnFlAIK19GHfd5/uow8DHjgu/2 dRHl/PHyiqhT8fhkYGuJVCAGGkHSBsf0oAS7ZpFnDix7wOXFiZ4+vzl8vDeWdnDOBeX+ syUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772091968; x=1772696768; 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=ph+uPWKuRkvWsmnv4xYT3GHGVLy8gBuWsg0hQehtf58=; b=oVvqfVCLM2GRpZXGcySoUNfxWUzcQMj1aUwEaopH3p4qTeWr+gt39ZuDaLRTPB+3FK Ql0TDhnrDSycDF4bK6dN5bH0tFTCw0AlajTwl17H33myKFfGY5lomaee3Iw5aZ6mnYDV RvcQUQ4QVEWIfRkppJZP5RzLLXfesxTLViT1Edw9UWH/h5JRpdDmfKAVUW4IcI5Qy0yC Cn9BdxPVk0J8qSaZJ1YJTCkHIsjoYkkF+Tjn4y3rvM8OYA0TuNPtRHIrE6YRo7C0utHt cOQMV/vEShmCAe8J7dOU/nvIdoOFDnXRoto26ga93liWK+/aUGk1taFYs6paX3i9PYGk AY2A== X-Forwarded-Encrypted: i=1; AJvYcCXBc7v963v2cltNfiD8JRyfafmvOQKCkgoBNrk5lO+MjAcpTrY9nKhgemile6LvFr9KW/ODGKqSA68G+Mk=@vger.kernel.org X-Gm-Message-State: AOJu0YzhyFzujyaRcX3LVr9Fp04AgxB1ThvaTHB1GD69Q9/rf7giANZD 2+DFDhq+3ON5LOK70fmjQmtxHRO9yVoDSTMA01EApMwfOUZP4cVEetq2ABBCzd5Abhiqty3jUav QuT0cnQGj9M9TOQtHlQShktdzgZJ4Om478OTebKCNrHbjGrH+Hh1zMgsL1dwmko3ce7o= X-Gm-Gg: ATEYQzwviE7rrDNSN1MRIWNlAKrpD0yqwL/q5f0M4B2Swx4FaiKTu9w/3JCb3f+cxdX cNvqjaJ/zQNFA2/H/HDuu+1rcfeg+543EorB2xXWB05v5NrG8Iv9Btne8I1xCI3JPcaMAJyE+W/ 2oS/ocaK5sPhI1wnVZ6tUw09wCULUubs5aEByjhmfmv4psnnjSf/2F6TIzor20Ia/TtKmgqBOxp NmgzIZ5T3E53xRXMKyyQdJdg5bVn5e/sxadNTytpTRJwONlLvnyTllEwoAjDTEY6Y9IQlSGOqA6 aO6SxmieLbBA2xAA6nhBFbewth2SrHlz/DaEAIDOuWsX4HCr0liV3zUZkp750kyfX2foEuPMi7v 0tKmEJxFMSWQo1Lct9msc6SfZ2JJjBAhiYdFnaZZJ6Bdcr5lfbCMT2iKi X-Received: by 2002:a05:6a21:1bc1:b0:394:5d0d:9217 with SMTP id adf61e73a8af0-395ad1abf1emr3116100637.44.1772091968270; Wed, 25 Feb 2026 23:46:08 -0800 (PST) X-Received: by 2002:a05:6a21:1bc1:b0:394:5d0d:9217 with SMTP id adf61e73a8af0-395ad1abf1emr3116082637.44.1772091967800; Wed, 25 Feb 2026 23:46:07 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359034bbfd4sm4891168a91.10.2026.02.25.23.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 23:46:07 -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, Charan Teja Kalla , Vijayanand Jitta Subject: [RESEND,v8 2/3] of: factor arguments passed to of_map_id() into a struct Date: Thu, 26 Feb 2026 13:12:44 +0530 Message-Id: <20260226074245.3098486-3-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com> References: <20260226074245.3098486-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-Spam-Details-Enc: AW1haW4tMjYwMjI2MDA2OCBTYWx0ZWRfX6RLwGKlM6TMj pld876JHEyCHUou5DpCAOtPV/f/9p0jPnkybVujnFxPMXd+1o+XNr02FcWCCzzhKlOxbYUmqN6K klZqYBHifE+rJMXks0jaaNylqMP5YLOd7tLhnWl4Z3G25nnfJrkx7IAzVV//aVAYhYmmQUrR2ag WL59PDXqbPvAos95t+esKa45WmhWRmUyztcpngR6jVgfOKuObBRIeiy2SQ6NA3kaUF7XLhWbECg D1dU6dk+p/zndeWfLlukh707OvawD0hTYZLbmdjnqAXkxGPbzYK6wGFtj6W5ad3D2ufKt4cLnRo P/0ymWfhKjACTIF449s04biF4H8YzOWxnFtcvUhfUFsLLsrZIUOapFBvbkumPuvflu+oKIvLWvu 2o2E9DMpidiV9B0r9cBpx0z2vg8dGafzNSzmwvQD3DUH8Zf48mwdFy5knvYKfMjhKGAMQmM8CT4 mwWRaWqHrARJnYv+CKw== X-Proofpoint-GUID: 36uPtABDaaqgRX_Jl6W8G7JGhvXqaeQP X-Authority-Analysis: v=2.4 cv=I5Bohdgg c=1 sm=1 tr=0 ts=699ffa41 cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=I3pr03k2-ahTGQre_g8A:9 a=3WC7DwWrALyhR5TkjVHa:22 X-Proofpoint-ORIG-GUID: 36uPtABDaaqgRX_Jl6W8G7JGhvXqaeQP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-25_04,2026-02-25_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 malwarescore=0 impostorscore=0 phishscore=0 spamscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602260068 Content-Type: text/plain; charset="utf-8" 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. Subsequent patch will make use of the args_count field in struct of_phandle_args. Suggested-by: Rob Herring (Arm) Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/iommu/of_iommu.c | 2 +- drivers/of/base.c | 37 +++++++++++++-------------- drivers/pci/controller/dwc/pci-imx6.c | 8 +++++- drivers/pci/controller/pcie-apple.c | 4 ++- drivers/xen/grant-dma-ops.c | 2 +- include/linux/of.h | 21 ++++++++++----- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index a511ecf21fcd..d255d0f58e8c 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -48,7 +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_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/of/base.c b/drivers/of/base.c index 57420806c1a2..6c3628255908 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2102,8 +2102,11 @@ 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. + * @arg: of_phandle_args structure, + * which includes: + * np: pointer to the target device node + * args_count: number of arguments + * args[]: array to receive the translated ID(s). * * Given a device ID, look up the appropriate implementation-defined * platform ID and/or the target device which receives transactions on that @@ -2117,21 +2120,21 @@ int of_find_last_cache_level(unsigned int cpu) */ 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) + 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 (arg->np) return -ENODEV; /* Otherwise, no map implies no translation */ - *id_out =3D id; + arg->args[0] =3D id; return 0; } =20 @@ -2173,18 +2176,15 @@ 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 (arg->np) + of_node_put(phandle_node); + else + arg->np =3D phandle_node; =20 - if (*target !=3D phandle_node) - continue; - } + if (arg->np !=3D phandle_node) + continue; =20 - if (id_out) - *id_out =3D masked_id - id_base + out_base; + arg->args[0] =3D masked_id - id_base + out_base; =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 +2193,10 @@ 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, arg->np ? arg->np : NULL); =20 /* Bypasses translation */ - if (id_out) - *id_out =3D id; + arg->args[0] =3D id; return 0; } EXPORT_SYMBOL_GPL(of_map_id); diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller= /dwc/pci-imx6.c index bff8289f804a..74fc603b3f84 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1139,12 +1139,18 @@ static int imx_pcie_add_lut_by_rid(struct imx_pcie = *imx_pcie, u32 rid) { struct device *dev =3D imx_pcie->pci->dev; struct device_node *target; + struct of_phandle_args iommu_spec =3D { .args_count =3D 1 }; 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); + err_i =3D of_map_iommu_id(dev->of_node, rid, &iommu_spec); + if (!err_i) { + target =3D iommu_spec.np; + sid_i =3D iommu_spec.args[0]; + } + if (target) { of_node_put(target); } else { diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/p= cie-apple.c index a0937b7b3c4d..e1d4b37d200d 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 { .args_count =3D 1 }; int idx, err; =20 port =3D apple_pcie_get_port(pdev); @@ -764,10 +765,11 @@ 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 + 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..5f1d6540049a 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -325,7 +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_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 824649867810..9d72d76f909d 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -463,7 +463,7 @@ bool of_console_check(const struct device_node *dn, cha= r *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); + struct of_phandle_args *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -929,7 +929,7 @@ 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, - struct device_node **target, u32 *id_out) + struct of_phandle_args *arg) { return -EINVAL; } @@ -1458,17 +1458,24 @@ static inline int of_property_read_s32(const struct= device_node *np, } =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 of_map_id(np, id, "iommu-map", "iommu-map-mask", - target, id_out); + return of_map_id(np, id, "iommu-map", "iommu-map-mask", arg); } =20 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); + struct of_phandle_args msi_spec =3D { .np =3D *target, .args_count =3D 1 = }; + int ret; + + ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &msi_spec); + if (!ret) { + *target =3D msi_spec.np; + *id_out =3D msi_spec.args[0]; + } + + return ret; } =20 #define of_for_each_phandle(it, err, np, ln, cn, cc) \ --=20 2.34.1 From nobody Thu Apr 16 19:11:19 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 2FB9F39281D for ; Thu, 26 Feb 2026 07:46:16 +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=1772091979; cv=none; b=dS3e/4lt9+oa9U2h7MeucEVtcl7Mu187ywUz3r68XdHIdUxY4R4YNZO4DWs6PwR4UmYHci4vVyURLE9LSihZ9zVVr4l+T5koIqYfyEWCB2VKWz51toE3SwfymWQVBQoG8oJVJb4LsH3KpAYIcocGJ6+ShBpIRBKYpiDvcH5lvYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772091979; c=relaxed/simple; bh=97fKR9KkmUm0My3uS7H/kxmfkSVg30uh7kelDLJQK4A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Di0VoK06ExzixGiRSNZGF5sf4HS0OGENPTYXhG2brB84v+HW7aztRoplJW9vwy0RQ0xYaIWeDXouFk/52cKDG8AqQbShrgjgRiZ4JVfMThJzqiu4SRZGasrq0coHeVXutKaRoZDzPT6Mtqk9qpIGIVUCYxQJSgGzv0ZWDHbQcxI= 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=ZmERtqMG; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ZhSu94Af; 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="ZmERtqMG"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ZhSu94Af" 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 61Q4VS65576525 for ; Thu, 26 Feb 2026 07:46:15 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=Pf/xZ2rGDI8 y/EE7BrQDE/5TEa5/yMessBlTMF9VMd0=; b=ZmERtqMG9TGAKdYtQqdNXqRUm/m m7k33+nJX3fUxNk/I/KeNQlCaXeblD3+SEFCC05oNM0PVR/fEvoIskQqqQC+Olg+ k5l8ZXTkkLh++zm6hcY7Jeddz+F00nEWu4TCYJDjqsVSC16JZCPNh1c5nsXYK+b5 +lSZwwg/rcYJeUh/LJhg4MpWZAetSazyDOBWDFuka4odRar//MeXSaedd1nCrRig hgDGMLQwvw+7ouAbUZAAHsrqT2VU2Dze3FSuKGaEkaWAJhf+hMp6twWj8ZdMMQeb MuOJvJmA2a5sxPmy3UgWatkSJaTI0RMAqu8cambV5wzyzMd1tSwYFbKikRw== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cj350jr3p-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 26 Feb 2026 07:46:15 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-c70ea2f7d1bso383416a12.2 for ; Wed, 25 Feb 2026 23:46:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772091974; x=1772696774; 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=Pf/xZ2rGDI8y/EE7BrQDE/5TEa5/yMessBlTMF9VMd0=; b=ZhSu94AfxRN8e2c7PeS29f0UhmzqFONJ68J9SZ8Uel47aBm95MCkpZfhVkSpvf6ciQ 67yJ2oNdJrJE2aRTbTAfAh1lc3FhyLi7VaXcTguBSqxpm06RPhWpjVqF0HEiab/KyYe4 j+S8QFLuqFjJlP5xjpOfu4iCMFxeHwe1l+LssFzNon6JKFYu/32bHfrN0hNZM3l/UBkg OPP8C3FX+pTOWvWmVJLHjEwCzAMhYwIqnPQ1N+iBx6i4MddF0iFZWYElvFn5rdo75PIM dW/iFxBD/dVac7DSWfoomy2g+TIrevub3KKbxgO3KAhlA2YN5P2N8lpG4ifMCwF5LJSL 8vNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772091974; x=1772696774; 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=Pf/xZ2rGDI8y/EE7BrQDE/5TEa5/yMessBlTMF9VMd0=; b=A00A8/GWylbeMkam1YXkMJmTXuz0JRwlgHpau0R0VSsrVd1VTLYSFpHje6Rn+P86NO I2dt0/KsRoohsz+Q9Odqa/Omh2avP8N3iLLxuxW5enwmiNsGJ+IqGbUsrRzkwC7xEGvd rwPi/4HXqk4ZyT3nyXO7RoNPmPQg0HKiJoeoW/CoK9G4dy+X+yUh72GPuTXry7AsdcSQ W69qL+R9eCeNw+wugPakMLSpohL8TL6H3lB3gqWO2mS4ktNYqjJT+HqYMjp4o6LoFHPb kjPdt9Bcz2HA96pF7RoCrsFFyz+xuALE6QPifmr70HU5Zfth34CRZWyFWHfg12mTgti1 j37g== X-Forwarded-Encrypted: i=1; AJvYcCVKJ9aeiiu59Ru8oRgv+zgxIzABtXs1Wy8htNGgLKCcoMiy4xA3P7Bt/mmUW2i37yfSbjauW2azcfdd/og=@vger.kernel.org X-Gm-Message-State: AOJu0YxwnY81Tez7RAa6KWjLaDOe6VAIXN3LHAcUxfDY7s5so6I3RhMS WBaGFtnXYyDJR36oDEE7ZpZcpq2Fke+WVdU25A63H00agFQuZekZjS1prK7ndO7cUCP8rf+wOsD 5ajm3Oi/mC43Ydtg8uPZ2VjGwl97P67GqAhObRdCsks+GpyOBnHxtJlfEtQ2FyAXrbkc= X-Gm-Gg: ATEYQzwEoHzQKicg/K6YZoi4mlDWJvXrcsymhk/AEqasHiGOdOEIxbI5JBUFKceQDBk Frqv1YqnPehOymGaiQTT0dNrnGoQVT2HmTVd3DLu3JUwgaBtlld3YvjHDlCY9+bkDq0GhxpMXDM yCw7yNpUXwoAr/OINPL0uZLL3Os4tbaSzquHWTywI+Y459rK8kR2KtXThM/c9bBp1EyQv5z5WAs KAzrCf3/dpaBk6f6NrJ8y/YnJ9TiTvwpd+zBSUm6tdLXCH8EXO8b/bv62P1T2/E5KGznxRuH8QI PmGIWVravew7PrPZmuDprpGJPCnChokC9SfBd499bapjXYJGZGi5oR9BTIh4NaLxXj3l+cqFmEX mNSJfAJChLdotcr74NdjxV7pZp9MgVAZ9tas2BQLoIRXMZQl4P9OeT65b X-Received: by 2002:a05:6a20:d43:b0:38e:99a0:105b with SMTP id adf61e73a8af0-39545f88028mr13948691637.51.1772091974427; Wed, 25 Feb 2026 23:46:14 -0800 (PST) X-Received: by 2002:a05:6a20:d43:b0:38e:99a0:105b with SMTP id adf61e73a8af0-39545f88028mr13948664637.51.1772091973885; Wed, 25 Feb 2026 23:46:13 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359034bbfd4sm4891168a91.10.2026.02.25.23.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 23:46:13 -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, Charan Teja Kalla , Vijayanand Jitta Subject: [RESEND,v8 3/3] of: Respect #{iommu,msi}-cells in maps Date: Thu, 26 Feb 2026 13:12:45 +0530 Message-Id: <20260226074245.3098486-4-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260226074245.3098486-1-vijayanand.jitta@oss.qualcomm.com> References: <20260226074245.3098486-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: P-9wSo_38HN6XdU7gdr01Mkp3QUUkVOR X-Authority-Analysis: v=2.4 cv=Zs/g6t7G c=1 sm=1 tr=0 ts=699ffa47 cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=wJGdY9mNwEi-N7fqGJcA:9 a=_Vgx9l1VpLgwpw_dHYaR:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI2MDA2OCBTYWx0ZWRfX3spgfuUIPvPB GqmupL7znFdoh4VTPD8bfxHFvNHGnwgrKjMAtOryAPVbqutnQfOh8Al6YlLDTrwWHuTeSvtP1BG oLy06FLqQEAzUEwcJ4aX8SPL8fApc75VIBUCEysbzJl7vCO/t1oYsg6EFD4I4IyboJDwgvV/7vh e6x9OOl/rZ9jHY/Uh5YnlokNpNQaUguNbjGACV+T1mrWI09iuzMYggfUmXk+IWhmI0cEfwT/er2 L9vFY2qr4nzqbL+C+Z5m8+V2P7fB75lEP4tdkCr1FqtLOc4vTWeqXzru7+brR1jogQZK4DUsr7Q do0olWGQF0Ca2NzN3ZwMfF88nhilJx5iF8awsi/5fbfVbfjUvbJnAib2JECo+GA5ZBtACNObmuE cMvjV/7G+dzMz7AJAEaaRTFd/0C833PfoKHDFcAmE5+DnQy78lLzxJcbTmNpHXC1uNYgMtt6z6R Q+qGXFrLiRTHdlbW3Aw== X-Proofpoint-ORIG-GUID: P-9wSo_38HN6XdU7gdr01Mkp3QUUkVOR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-25_04,2026-02-25_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602260068 Content-Type: text/plain; charset="utf-8" From: Robin Murphy So far our parsing of {iommu,msi}-map properites 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. Added support for that part --charan Signed-off-by: Robin Murphy Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/iommu/of_iommu.c | 2 +- drivers/of/base.c | 117 +++++++++++++++++++++++++++++++-------- include/linux/of.h | 16 +++--- 3 files changed, 102 insertions(+), 33 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index d255d0f58e8c..a18bb60f6f3d 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -45,7 +45,7 @@ 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); diff --git a/drivers/of/base.c b/drivers/of/base.c index 6c3628255908..596bcf993dcb 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2096,11 +2096,38 @@ 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. * @arg: of_phandle_args structure, * which includes: @@ -2118,18 +2145,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, - struct of_phandle_args *arg) +int of_map_id(const struct device_node *np, u32 id, const char *map_name, + const char *cells_name, const char *map_mask_name, + 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 (arg->np) return -ENODEV; @@ -2138,11 +2166,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; @@ -2155,27 +2181,63 @@ 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 && of_property_read_u32(phandle_node, cells_name, &cells)) { + pr_err("%pOF: missing %s property\n", phandle_node, cells_name); + return -EINVAL; + } + + if (map_len - offset < 3 + cells) + 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); + return -EINVAL; + } + id_off =3D masked_id - id_base; + if (masked_id < id_base || id_off >=3D id_len) + continue; + if (arg->np) of_node_put(phandle_node); else @@ -2184,11 +2246,14 @@ int of_map_id(const struct device_node *np, u32 id, if (arg->np !=3D phandle_node) continue; =20 - arg->args[0] =3D masked_id - id_base + out_base; + 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 @@ -2198,5 +2263,9 @@ int of_map_id(const struct device_node *np, u32 id, /* Bypasses translation */ arg->args[0] =3D id; 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); diff --git a/include/linux/of.h b/include/linux/of.h index 9d72d76f909d..5b5b5dc2d3f3 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -461,9 +461,9 @@ const char *of_prop_next_string(const struct property *= prop, const char *cur); =20 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, - struct of_phandle_args *arg); +int of_map_id(const struct device_node *np, u32 id, const char *map_name, + const char *cells_name, const char *map_mask_name, + struct of_phandle_args *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -927,9 +927,9 @@ 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, - struct of_phandle_args *arg) +static inline int of_map_id(const struct device_node *np, u32 id, const ch= ar *map_name, + const char *cells_name, const char *map_mask_name, + struct of_phandle_args *arg) { return -EINVAL; } @@ -1460,7 +1460,7 @@ static inline int of_property_read_s32(const struct d= evice_node *np, static inline 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", arg); + return of_map_id(np, id, "iommu-map", "#iommu-cells", "iommu-map-mask", a= rg); } =20 static inline int of_map_msi_id(const struct device_node *np, u32 id, @@ -1469,7 +1469,7 @@ static inline int of_map_msi_id(const struct device_n= ode *np, u32 id, struct of_phandle_args msi_spec =3D { .np =3D *target, .args_count =3D 1 = }; int ret; =20 - ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &msi_spec); + ret =3D of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", &msi_s= pec); if (!ret) { *target =3D msi_spec.np; *id_out =3D msi_spec.args[0]; --=20 2.34.1