From nobody Sun Feb 8 20:13:39 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 From nobody Sun Feb 8 20:13:39 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 0A00B429813 for ; Wed, 21 Jan 2026 05:54:37 +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=1768974879; cv=none; b=UZCjBSLTPEvlkKhZOr6LG/0RzwA+VU6iNw9f1PY9F8D2JA1a5p40cpAtFk9btjyrRwYqykH3aYCTXKhU0zrhJlQeDnDHbmlL/zTjvRnbP5b/tzFUJk7iKMgGVoxKc1jyzqRdX2dPr4XyoRirC/vg6iHyS7pPznkPNKg5jCv5Nxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768974879; c=relaxed/simple; bh=RR9FWlUz+1xVRmoePtM/Bqph/SAqgDPzbxXNpm+2Xx0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UH3l7dbfwiR/6IeuVKMQqSj4PdwydXHujrl+iJ7aGJyrGgOKV5/fLSRFrUJ2ROyc57qH9kNnBf7ik2RGk21rSP6tDi2kJHzlUqNBuFHvg42DVFwNO3jjMWJDEBpmbHEHDLTFPmAMZ+Q5JE+G6Cl8Ki9F5JmCSgAhlrkVigNpTMQ= 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=glNMt0bD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Uou0uhiN; 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="glNMt0bD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Uou0uhiN" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60KL0HJi1530571 for ; Wed, 21 Jan 2026 05:54:37 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=1ykmUyUQ1bF wmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=glNMt0bDf50Bx5hpaKQx2Ab5cl4 qhjfm4joHYToHlGUYJB2gFaz7s6BUk7g8/HTOzLZrFOiPOscU38BSiNpdb83tDcE mSsVUHgoIxYUOTxN0ADhqSRLy4YV9J2G9DJRNjMUt6hqOhvg32S0QPcE8LSdHlnA 7axvkBE2PdE5F9mCJVODD/xhZKx9CjIC4O2rRtqnYvycZODxRwB8LiJWQxxTXH7H JQiUGfki6WA7bIvfUHMByiVHKFxLVldz/DDmejsiQetTDxZwBn3RH6HK/pnhvgsl EkxZujEoowaUzhx507otl0X1nybMnPFCOjUACd1sASdnny7mOotwLX17c1w== 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 4bth83hpyj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 21 Jan 2026 05:54:37 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c551e6fe4b4so3838852a12.3 for ; Tue, 20 Jan 2026 21:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768974876; x=1769579676; 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=1ykmUyUQ1bFwmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=Uou0uhiNtS8L+vwLqFZWtP0zS4xgE3GQ7y36Ky0mEnOPRzt+hkkf/eJ/hmWeFEI0rl htUndOxVqfTIE9j43B5Sqtda5fk1xUs6sfs6xGKNow+3i4hm8BbbHmgtDDoa8xjWdfHM srxIT2b5Gp7w7RPhFY9cr6U7qDjHzTFO2kPFYnYkT3XPItaWw67AnBipZ5Y8qS75uOQm HO8ZxHS15cnXwrH5i5mNQCZgM5oc/xhnuFGSSUpFTw17Dq+XDg0t2J+G0Vo87rIzRq/7 iWTERoQ6kTVPsN0vOjqV1eTMO2jAl6JJkc9+HmjqtTp8oUi3YkY7J6jWRuUdJr8AQ7uo 4ZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768974876; x=1769579676; 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=1ykmUyUQ1bFwmEK+dIW9dl9UbR2EOlU3YHXvC7GZAyM=; b=qJnB6f/gp3URNCZqtHK0RysvIsrVPoEf3bLLMY6F6xG8vP/cz4UvxTkuY4QDRhN8yH A2oVyiBIdk/Okajrl/xag3l05KChkbkvjGUCUtgVg4kXrpJOvljcGJBk9VUehDsfwsqN OeheeXID2gvevGrBTFYJM4YPdzSEBAjcGaCFLZ7UlMahE4FsrcjtZjZOu07GJaxFCD3N ig8PLI7BrO52BN8ZjKhQNWLbj7mrLegyGiW1F3Fb8VbkDUfAqYy7+MfFf2tTChxSjwwO 6NO+Y6dSxGLovGaydy5mHGzCAd9xaO56sDYsvrqw5eYhfUWhFtQ2i1H2iqTtNEiVKhrn GPqg== X-Forwarded-Encrypted: i=1; AJvYcCVJYNBfK/GUR+xFIT2gAP1ZSSs5z1jPTTZxcwMcXboQZAEdoOXORgxVu3RPrLP9AAc7gMdN+u0C7g82G1s=@vger.kernel.org X-Gm-Message-State: AOJu0YwUgG+KgqnJBYQAZk5fnWuwcinYOymLWqY5H8X5BsYsHjwT+593 G9dwFvsKdY+PAEfe8WSKc2dBfqpnF5Dmf/LhMHXdXO9RmF2MsnNW2z2+c4fqB5r++h7QTmTFG0z 6nyujC0yRQgeZ2mo3R47oidFcovmDtYM6MLH19t8Q+MG21593Kw13hjgaZ6Am5tC30L0= X-Gm-Gg: AZuq6aIIdpb+I4gaBc47VBeVxxB7Jqh6LUdzqv/TlaK29xAgWK3PsxJN32uVW3urNYd 7q0JpSYaIC8EukfvO3Qw2aBNzGbQfgZQnK4r0ynoE8qJ0E6Tt/lWZPosz7Ct+Go+wtf4jIbjfJU 4C8++p5CcQ9e9WAiBvm1C19SxqtcxbTJsVuyrZHcX4OdSypkYMT9892Q/Lm6JQW8N67iVEddgqk FDkhWxcfuhChEooq0bEy1Ki+cld0v7QxV7HoaHUxQa/5Mc1QCYz4o/Rlul35OacQQ9Z+CAV90xT ysOpCUoflSjuUmOZ5GcYqxAgbxy0TEiPk+hPyU5KOOJPkZEv20xMLCdqm8YVJw55/rbobfjJ41b Ce1DLYSH2AFN8jb2CaWhblNyoZNbxjw4+3T2FytP7Gwf8 X-Received: by 2002:a17:903:3c26:b0:2a0:941a:6b08 with SMTP id d9443c01a7336-2a7175395a4mr150649705ad.21.1768974876144; Tue, 20 Jan 2026 21:54:36 -0800 (PST) X-Received: by 2002:a17:903:3c26:b0:2a0:941a:6b08 with SMTP id d9443c01a7336-2a7175395a4mr150649445ad.21.1768974875620; Tue, 20 Jan 2026 21:54:35 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 21:54:35 -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: [PATCH v6 2/3] of: factor arguments passed to of_map_id() into a struct Date: Wed, 21 Jan 2026 11:23:59 +0530 Message-Id: <20260121055400.937856-3-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: sSZ2IjEvFDenAmokcgPdpfxXX2TcW-LC X-Authority-Analysis: v=2.4 cv=TeSbdBQh c=1 sm=1 tr=0 ts=69706a1d cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=rukgfAGnDChJCile_RwA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIxMDA0NiBTYWx0ZWRfX21lEBe2d3IRS Mlxiktah0ZWX0IET9dLF5DuGr4oHyduXxie7D4SESbLqD+4nh5d8ronoUW98NZBweRwvPfeadti iVJjXuDnVSf5dXZ7/f+EJSjWb7Pux2XS2AJdy1MaJDWY+cgzJVdqyVuYSzuGh4Tr+YUDmAULGal +vK2pBz2IHEbRA3etXCVReCcefEepu5zsSsCHxJFlGZAYcw6+N7PUTrhGozBaWWTtb6zTcde11Z KuL/+Vb+382TDgci2EfGNmO9ojacaB8KIsmWA0beS1lntmtpgXh38J5qMuChdCcXGTCjH5v+COs wTOx2wIrYJibJXN8cnNmJuNDfYbwLUJPxbw8JY2Hn4UUNPOMNW7ia31Zj76W1llTGDNZsyt97aH Um0q/1NvY/PRUEmkWVMTifpmHuOL0Xiw0Ee04K+rvTJeYhsA25kTfYrEAciv8SlVqKH/SQWGubZ 2Hp0/ZB7Z+J2/Obex9Q== X-Proofpoint-ORIG-GUID: sSZ2IjEvFDenAmokcgPdpfxXX2TcW-LC 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 malwarescore=0 phishscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 bulkscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 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: Charan Teja Kalla Introduce a new struct type where the optional arguments passed to of_map_id() are Currently embedded as of_phandle_args struct. Subsequent patches add additional arguments to the struct that the caller expects to be filled of_map_id(). Suggested-by: Rob Herring (Arm) Signed-off-by: Charan Teja Kalla Signed-off-by: Vijayanand Jitta --- drivers/cdx/cdx_msi.c | 2 +- drivers/iommu/of_iommu.c | 12 ++++++--- drivers/of/base.c | 37 +++++++++++++-------------- drivers/pci/controller/dwc/pci-imx6.c | 10 ++++++-- drivers/pci/controller/pcie-apple.c | 4 ++- drivers/xen/grant-dma-ops.c | 20 +++++++++------ include/linux/of.h | 32 ++++++++++++++++++----- 7 files changed, 75 insertions(+), 42 deletions(-) diff --git a/drivers/cdx/cdx_msi.c b/drivers/cdx/cdx_msi.c index 63b3544ec997..7ed9643f1815 100644 --- a/drivers/cdx/cdx_msi.c +++ b/drivers/cdx/cdx_msi.c @@ -124,7 +124,7 @@ static int cdx_msi_prepare(struct irq_domain *msi_domai= n, 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; + u32 dev_id =3D 0; int ret; =20 /* Retrieve device ID from requestor ID using parent device */ diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index a511ecf21fcd..646ac5a67475 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -45,15 +45,19 @@ 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_map_id_arg arg =3D { + .map_args =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, &arg); if (err) return err; =20 - err =3D of_iommu_xlate(dev, &iommu_spec); - of_node_put(iommu_spec.np); + err =3D of_iommu_xlate(dev, &arg.map_args); + of_node_put(arg.map_args.np); return err; } =20 diff --git a/drivers/of/base.c b/drivers/of/base.c index 57420806c1a2..fa0acabfd420 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: contains the optional params, wrapped in a struct of_phandle_args, + * 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_map_id_arg *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->map_args.np) return -ENODEV; /* Otherwise, no map implies no translation */ - *id_out =3D id; + arg->map_args.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->map_args.np) + of_node_put(phandle_node); + else + arg->map_args.np =3D phandle_node; =20 - if (*target !=3D phandle_node) - continue; - } + if (arg->map_args.np !=3D phandle_node) + continue; =20 - if (id_out) - *id_out =3D masked_id - id_base + out_base; + arg->map_args.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->map_args.np ? arg->map_args.np : NULL); =20 /* Bypasses translation */ - if (id_out) - *id_out =3D id; + arg->map_args.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 c3e5cb3cb846..641f9d34f7a9 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1138,12 +1138,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; - u32 sid_i, sid_m; + struct of_map_id_arg arg =3D {}; + u32 sid_i, sid_m =3D 0; 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, &arg); + if (!err_i) { + target =3D arg.map_args.np; + sid_i =3D arg.map_args.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..2df15fe075fa 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_map_id_arg arg =3D {}; 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, &arg); if (err) return err; =20 + sid =3D arg.map_args.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..8c332b7ff148 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -319,38 +319,42 @@ 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_map_id_arg arg =3D { + .map_args =3D { + .args_count =3D 1, + }, + }; =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, &arg)) { dev_dbg(dev, "Cannot translate ID\n"); return -ESRCH; } } else { if (of_parse_phandle_with_args(np, "iommus", "#iommu-cells", - 0, &iommu_spec)) { + 0, &arg.map_args)) { dev_dbg(dev, "Cannot parse iommus property\n"); return -ESRCH; } } =20 - if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") || - iommu_spec.args_count !=3D 1) { + if (!of_device_is_compatible(arg.map_args.np, "xen,grant-dma") || + arg.map_args.args_count !=3D 1) { dev_dbg(dev, "Incompatible IOMMU node\n"); - of_node_put(iommu_spec.np); + of_node_put(arg.map_args.np); return -ESRCH; } =20 - of_node_put(iommu_spec.np); + of_node_put(arg.map_args.np); =20 /* * The endpoint ID here means the ID of the domain where the * corresponding backend is running */ - *backend_domid =3D iommu_spec.args[0]; + *backend_domid =3D arg.map_args.args[0]; =20 return 0; } diff --git a/include/linux/of.h b/include/linux/of.h index 309c5681744b..514f4f018f99 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -74,6 +74,10 @@ struct of_phandle_args { uint32_t args[MAX_PHANDLE_ARGS]; }; =20 +struct of_map_id_arg { + struct of_phandle_args map_args; +}; + struct of_phandle_iterator { /* Common iterator information */ const char *cells_name; @@ -463,7 +467,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_map_id_arg *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -929,7 +933,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_map_id_arg *arg) { return -EINVAL; } @@ -1458,17 +1462,31 @@ 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_map_id_arg *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); + int ret; + + struct of_map_id_arg arg =3D { + .map_args =3D { + .np =3D *target, + .args_count =3D 1, + .args =3D { *id_out }, + }, + }; + + ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &arg); + if (!ret) { + *target =3D arg.map_args.np; + *id_out =3D arg.map_args.args[0]; + } + + return ret; } =20 #define of_for_each_phandle(it, err, np, ln, cn, cc) \ --=20 2.34.1 From nobody Sun Feb 8 20:13:39 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 357D343634E for ; Wed, 21 Jan 2026 05:54:42 +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=1768974884; cv=none; b=iWzdVlfI5DdWQhV+grU+eTS0kjczGmyqWzRnv2uVqLpMy6s7uxiyIV5dkWd2UR40R1PcRdcl6kD4xGiIjo1sYvEIjiCdY3F4sY4Bb3DXK/U16/DAdvh+6W8L/MW2aoVadKd9scbiPBOGeYJIzBp8BVm4G6KgkDF4Ue0G9/u+5sc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768974884; c=relaxed/simple; bh=xaTFyBurmmvNtHA7oMxSSwhBxJ/ddKy3uGWyizniZzA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HbNQJYvXvU/nydr/nieH2w6tMDcZMx1yDwXGJ1dNWrm+lm12nSSylFWGsa6000GqZu9ZqWoPrwwrB2Rmfv5YKUpcCyP83eVNBFH6G6jO+7usD78r1uxk5Eb7v5r5rcUMFSsIFk5k00X4qWoW9tlct5//ycUQ5v2bc+1ym1tmRBo= 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=oQNfYemq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cVAq63jQ; 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="oQNfYemq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cVAq63jQ" 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 60KKSVrs385384 for ; Wed, 21 Jan 2026 05:54:41 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=byjsK3rK402 /tmrgBPq1R1oFXm1Avf0oayBzPBZFLwM=; b=oQNfYemq7sOYpLaD7mdjHsqUEfZ KdEUXZ6cJvw3guYbIomA+sTCEF5nCe1dyZ8s1/XsRBeDBocCirl0IkT1WugS9Mf0 OwFFmFc0Bey9gWdmqWQtVwi8ATLtNoAlbkwqldM38xdc8+L3bH9BYaEmXk5NPgMq II6LhMzaW/+rwG3BJwK1ERnD34VgPVZiTT+vlPKeo2pa2ykvBqXMXECHTTwyfsto Z1bCGcLKq1VR70PJN8jXDjT7HmeeFEdieDUO5HmfF5jIqomov+lOrL5OcDVE/gDV PRS5TCp34jQA0tCzTfHkyf4o6hE5SNQbcDrJSvk/6uL789y+6GtDCum9bkg== 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 4bta7qb8rq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 21 Jan 2026 05:54:41 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-81ee4f90ef8so5289432b3a.1 for ; Tue, 20 Jan 2026 21:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768974881; x=1769579681; 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=byjsK3rK402/tmrgBPq1R1oFXm1Avf0oayBzPBZFLwM=; b=cVAq63jQx41bzY6ctNNQB5nYhL5cpR/9yAWBGOOiy+9uAACIRC44eoTqtMQAaxbxQu hAPk2BYjwdcd4UYwYkQ38TPn6c4LF28zXDrr+/TrPkoMJXfypKRkcGFXzK5bYC5s9Bl9 hSL8BI5H/LvORh9bTbxXVvoSXnSz4ZXy+LjwzjT5pNrK1CVgiNQQuI7IFhxZCAAQm841 uM00p2cLYoY11l9YK52q+Sk8u62et6eK01yfL3g8rkyE7Ap66UeDL6sgyJkvq/v1yBml dvINlSuwBrr7pK2MzHE+9OCEWjILg/SsDpKFAaN/2j5EJ/IRq/ylQ8p5I0BtE/BhoOb1 049g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768974881; x=1769579681; 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=byjsK3rK402/tmrgBPq1R1oFXm1Avf0oayBzPBZFLwM=; b=cGiEEXnJ+SEswOrxDWyJXV8nFzOQ/NLx8TKUpkni4fDKWgAGuoBNsQ890TM4nnzzxo VWuHC+HVaIW6afdu28FpKLSO1Xp88uYtgdMCEbCMa64sN6XAx7oVzGriPBNKfyym+L6B K7nUZd8Jg6mnlvClR1UoEPzu10dV729u+ozv8a9fY8NuI85McE81URUEgVMM6mdEtAL6 blVIpOG2uNH1rwxOTdAvOGVVdMoRDo2vIEpxkIeWeU4IonNpMvecTG1vd9iTrTYT+5/b cqeTBJBfTQ962ZGCAFcM6JeCIpfGk6Vpq5kpgGPYV6HC5puzuEw/RKHXgla+Jasf90zN RG7g== X-Forwarded-Encrypted: i=1; AJvYcCVmrcxEYTrEqKQZfDUwE5eoK/nZDAn2Bi1yuUoq1M75c6gtI+r0QxxH0LTuQButNbxGhFshRlTGq42gS5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxOv/sNTUsP5nMaWp55lxSZ73KoPfbrCCl6YTW2BHXg/ZejG8nT YpRFamPWBCnGjgsFTBWS+0Pse88mub9KmBwf4cHDXrGbZhOcarkrVONret1772ygX5JZoxlFTq5 ELz1D6TkxAkZHYmZfr6v4E2inB2jXduXLimcc4Sx+gdT7GhBe59F5lfzXxXOisf3OF8k= X-Gm-Gg: AZuq6aJxi/7NChvBEJETlql9tBMiF6vsybeN+cB5FnivpGmw+mmZsY0krsW6t0/W6VF y5ZrRU8AQG8QF3mRxjLrUpSUE7YDJKn/vPEyMpKvG9JhCG1zH5liP5dfkPuPPnzekZ27EisiFGZ Qs1RjZAiQ1oWSYglz9IlVQc4VZAXFlxek58AHq0FJew7IaNvoJNRQOPa/R2U6sKZYv+3pSXJfcj E6sFlXCvH9XPVyO55RRiL5TK8E8KtwZ5e0dGDnltfY7AQqqlvIRUslMfWpRMT8MzvpdFFepK0Dr wOecmaOq5Vo3b6Q4ZcHKzWYSEJFVXuP8AgnaEe4m6eWomxQYnmU+m50jsX/p5Uox8+ZeoJLhU6Y n2fkvOed+wuzX5ppvbR6XhqEOqF0QlkIbr1C1IQREy47V X-Received: by 2002:a05:6a00:39a3:b0:81f:4e36:38af with SMTP id d2e1a72fcca58-81fa0340a7emr15191991b3a.60.1768974880566; Tue, 20 Jan 2026 21:54:40 -0800 (PST) X-Received: by 2002:a05:6a00:39a3:b0:81f:4e36:38af with SMTP id d2e1a72fcca58-81fa0340a7emr15191965b3a.60.1768974880020; Tue, 20 Jan 2026 21:54:40 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 21:54:39 -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, Vijayanand Jitta Subject: [PATCH v6 3/3] of: Respect #{iommu,msi}-cells in maps Date: Wed, 21 Jan 2026 11:24:00 +0530 Message-Id: <20260121055400.937856-4-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: 1wTBfW5-xJZn6rTLcg1-qBjhwTVaoGlw X-Proofpoint-ORIG-GUID: 1wTBfW5-xJZn6rTLcg1-qBjhwTVaoGlw X-Authority-Analysis: v=2.4 cv=LPBrgZW9 c=1 sm=1 tr=0 ts=69706a21 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7CQSdrXTAAAA:8 a=EUspDBNiAAAA:8 a=wJGdY9mNwEi-N7fqGJcA:9 a=zc0IvFSfCIW2DFIPzwfm:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIxMDA0NiBTYWx0ZWRfX0C9bucwd+wak Kn/LOJ3Wj/0uVNofdfg650fw3dHELqoHaXK3LXta2FmM4el4GaRFICt1SUqBQsHMOWhWv1WbRFs KQYoHAXjEktuqfUQrXW7WQYEKL+Iu7PFS5pECGPRaILbyC3YwggDyvPsuYbaUFJh9n7g821fvbE lSYmg/UeinhVHk6D1wd9ASZxyA2CCf93h355YyZFeYiRJCydp2oBvvU5SBNnV/pgJXLUXrPbguA MH1ZxAzLpG1kz30lHmwgEXgJnDLTBvy7E11D0zhRl6HwTkBwEnXyxkSztAyUz1QqTXf3K8VxmPg uHCgInJNVNjLGZlHZ1L3+JptdznZgcjq4WM2mGg2LFZv0in8z/63BpNoO32ATsgHeZDYhw98lhG Csw4AjtuQ0bQNG9WfTm8mAS5osGpjtp9YJn3/Kv7GLehf4oEU1TJHjDFGCUE8e9y1nQTmcTXcYB rxR6GBqNS/RtQt/+Zcg== 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 So far our parsing of {iommu,msi}-map properites has always blindly asusmed 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: Vijayanand Jitta --- drivers/iommu/of_iommu.c | 4 +- drivers/of/base.c | 115 +++++++++++++++++++++++++++++++-------- include/linux/of.h | 16 +++--- 3 files changed, 101 insertions(+), 34 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 646ac5a67475..768eaddf927b 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -46,9 +46,7 @@ static int of_iommu_configure_dev_id(struct device_node *= master_np, const u32 *id) { struct of_map_id_arg arg =3D { - .map_args =3D { - .args_count =3D 1, - }, + .map_args =3D {}, }; int err; =20 diff --git a/drivers/of/base.c b/drivers/of/base.c index fa0acabfd420..0825f3dc93f2 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: contains the optional params, wrapped in a struct of_phandle_args, * 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_map_id_arg *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_map_id_arg *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->map_args.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; =20 + 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->map_args.np) of_node_put(phandle_node); else @@ -2184,11 +2246,14 @@ int of_map_id(const struct device_node *np, u32 id, if (arg->map_args.np !=3D phandle_node) continue; =20 - arg->map_args.args[0] =3D masked_id - id_base + out_base; + for (int i =3D 0; i < cells; i++) + arg->map_args.args[i] =3D (id_off + be32_to_cpu(out_base[i])); + + arg->map_args.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->map_args.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 514f4f018f99..9efa6f93712c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -465,9 +465,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_map_id_arg *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_map_id_arg *arg); =20 phys_addr_t of_dma_get_max_cpu_address(struct device_node *np); =20 @@ -931,9 +931,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_map_id_arg *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_map_id_arg *arg) { return -EINVAL; } @@ -1464,7 +1464,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_map_id_arg *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, @@ -1480,7 +1480,7 @@ static inline int of_map_msi_id(const struct device_n= ode *np, u32 id, }, }; =20 - ret =3D of_map_id(np, id, "msi-map", "msi-map-mask", &arg); + ret =3D of_map_id(np, id, "msi-map", "#msi-cells", "msi-map-mask", &arg); if (!ret) { *target =3D arg.map_args.np; *id_out =3D arg.map_args.args[0]; --=20 2.34.1