From nobody Mon Feb 9 21:21:53 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 B613D24EF76 for ; Sun, 21 Dec 2025 21:36:31 +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=1766352993; cv=none; b=Jb7sk8K9aQsFVScRZVKEeLs1FjgcqzE+KoPj9F4qYN6wiXjFNsSuyLSvYVZZXERwJH0GmY2h/jKy/Oq20xR1ljiqS6X8mCiXhhpiUlRmcgtyUfDo7RyXL2B2lfb5XTZ5Rk4VuRBO0y76mUYE7Bxq567UUazepB2bWni1lYf0+VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766352993; c=relaxed/simple; bh=ZI/dat0pnePJL3uDPgam7hb7hJJGmBB96a+N9P+pXEU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dj8ZSkcx0uqCp4zCX9hA6KuFg7CgQsXmRDlqCdFV4FodHMKigOff5IRPAP6doDh7RAJg+2TS2DHH7P0yuvu9VTlp4EsXmCL+AbpRictmy+V98YA6qpZN338THAE/qkc5ywFdLreHcqEoEsx1OBKAgnRpjeAo9PYYL8bg5RufZT8= 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=RpW8pqMS; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ro8F9WgK; 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="RpW8pqMS"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ro8F9WgK" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BLKgoQF3548146 for ; Sun, 21 Dec 2025 21:36:31 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=LPwYAZthCsX O+QFdi7+uTYp6zaILxY0tD6IDNL46v60=; b=RpW8pqMS1xNcrfJo/kbs/d2xfER +e+VULeLyEiCGMaZbcTCk+JM56exryugfE25nCgZbblJLMwtwkoim292a82kAQTQ AxDqD3Wva36TcRMxHU3GNxy4HY7Xm8TJ3rBylLWPkvkTDhpVg+vUe7uFkexQvIdk uNXv0gBIQ9u8rZWwFz9t/LOgIgNK/O/gg9zlKypBijor+fhyoVt0bn36AcCDK6G6 yYCpuwJ57X9fxnKtGFzar3eYDPa8uBUUY5Zz7L0Rzui46nd8zlhnnVEcxBdroyau vg7X7cBIED2muvFP+5jX4REdM1V2yUq8lIav8x42UbLHOKpdDFMxqVdMILg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4b5mru2x7e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 21 Dec 2025 21:36:30 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2a0c495fc7aso47811825ad.3 for ; Sun, 21 Dec 2025 13:36:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1766352990; x=1766957790; 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=LPwYAZthCsXO+QFdi7+uTYp6zaILxY0tD6IDNL46v60=; b=Ro8F9WgKGtIFxPzW81HpNL5y8NfQn1TgTc8F89IDe5CI+CJ5fy1btZs2InvvFhxC0Q B6SAhKd/3f/t6HsharODJBuYgtkkaGSgeDOsrqANO+CEsfa9101BcgUWnUHGSrQBF5lb xmb0h2qI2R+1fR5r/uwWmt+D9X8CKCTAWUvle2ggUugWbX4iXjf9HOFapdVsj0ROyPtW izzpWakIHqn6iHvCklHk2fJJQ0ufzvEjjqLkrbz04bBc2TxiHPESwpnGScbmL+JZmWPH zRwwlIJvO8Rr0x2mTFL8HTlQ2v81n+DO20UA8GUqYuNbQr9Hs66cNLj49wS05VzR3Gex wwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766352990; x=1766957790; 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=LPwYAZthCsXO+QFdi7+uTYp6zaILxY0tD6IDNL46v60=; b=PiaJTHNO14R3WOZJHJ/aD1N7r7JDMWbyfUAzpcdbABbBkNR/wILH2z1JMhGw4fNZh3 KaYzT30AONeYkcXVq/z+l0uw8MPTHm/o9f0XSHFOtcBoQ/2azDflHJDF60FNJZ1XZrhu v4ZTNkddmTC05OJqgqMfp7neleQ2Zi5Dm/577pd3QXOF8CjpsYQ6lN6+z4w1MSCS5m2s KuSYciMRbbS+K6CMeKRGRJcqsCNIaft8uvCpGuzf34rr2g1vJCsg4DcgkKOds5ZXMYcw Zap4vihqN+teQaxbXu/J9pKWgd2ETu1a9SjEQ/vzxGtZzhrXKysJA1dDK5qIg3c9D6I+ VkjQ== X-Forwarded-Encrypted: i=1; AJvYcCXidZ8AvxG3gvqT0+BlgOsEJ91fpt4nE34k9pdkoe1p2FcU5HYwg5S7fN7hPB+V67TWzBUsQg2u7d4v8Xc=@vger.kernel.org X-Gm-Message-State: AOJu0YwRDTtWyTBDloJenFR+prQRp5BFQxxbHmkFG1pM0hq0+RmXN/vT FknGTl8LyxflbWgyRj83ZiHHdPvWAOi9fDXbk30FTM0SHTtyTZQ1pFuu+I2xm9IXdrU9oopDPhH SMDK04sqQXzqFHG7tvGs62R57inNQwTGE0/A54eQRTsoXyeSK4gE32vnAhu4D6JC6p2c= X-Gm-Gg: AY/fxX5c5SQOJmBsZJHR/5IvteCha0HwQLvNippoIwttI2ckxtKko6HCeeAuc3ZBxcI ntqV9HuEWOE/tLo090wNF6wt5BglhIA2s+WDR32mshkoJ2oBNHWLXSAsG4IonZnsEoCSk0keDuR BJbtOZoZxOSGEDwPhki7mYIDGOxCeU8o4w+C8QWjxlb2CAsnksBGhQgR4VkTFZ36o9GHxUhk7hJ OQaC8aQyB1YxrEIcPwNGKIKKjGRlKXcqjlJVUohu5K5RMeledE/o06SMyTtPsP7Lga2LyoVzwcj gMs+2be41v2cN4wQnUjgYkWk/zYxjXuMdq0orcHUO6tt4xfEWFje0gSnl9r79LoUf657mIu1tn5 MbVhKOVoyneHxtAwqAJAN+dkc5FALlYHybsN+N9WO8DVD X-Received: by 2002:a05:6a21:338a:b0:35f:6e12:186f with SMTP id adf61e73a8af0-376a7aed68cmr8628733637.23.1766352989841; Sun, 21 Dec 2025 13:36:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IFd1nWrqRTbCiMSBO6UqtQqKGo3Vxxy0BoNOtDC2XC5Q4ZeI6Hvgt2VnL6bDeMMm/1vB1QfNA== X-Received: by 2002:a05:6a21:338a:b0:35f:6e12:186f with SMTP id adf61e73a8af0-376a7aed68cmr8628701637.23.1766352989279; Sun, 21 Dec 2025 13:36:29 -0800 (PST) Received: from hu-vjitta-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e70dcc7c8sm10950163a91.15.2025.12.21.13.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Dec 2025 13:36:28 -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, saravanak@google.com, 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 v3 1/3] of: Add convenience wrappers for of_map_id() Date: Mon, 22 Dec 2025 03:06:00 +0530 Message-Id: <20251221213602.2413124-2-vijayanand.jitta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251221213602.2413124-1-vijayanand.jitta@oss.qualcomm.com> References: <20251221213602.2413124-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: AW1haW4tMjUxMjIxMDIwNCBTYWx0ZWRfX/Da6Vi4W+cur Y6Z35dEeYfG2v/VDMiMjM1O1DLBojKtFaHKb31p9XzyrRrKYaW17pfncHUukqMZjBSH6HQpRQpm k2LUEDbH8THk29gwj7U/AZIwvWs/N6OSKfvdmcm+zezerNlaob7iOVj4EeOWuFi0cRO4Sa2prT6 dPW1p3M2tkShRx80hMMW65vvqj0+pN6bGqhKfB1iBNgFKhoSiOjhbPvygis7MaQ5Md4fJ4/zzXn gCh74MKxxGzUGTXv2PLnWUe4Epq7S9uEsnHYTPoQHr6ExJclQImJ/xSq6t+K0G7HWeSc965YzX1 B/Vl1R4kvbUlMm9cTFdM8wsJI3rz2lL0ixVduEuFWCADjlW9Vr2xBtqE1Q/UFDBWtjjWn/xZcfZ ctg6WoSWvH8BMKksD4Q3wNZRNCBCWtXSe7iSs09DAhAvU95EdtRcOaug7Im0o3F9pAyg14TYlno NDhDaXPmdVSAHxHuXhw== X-Authority-Analysis: v=2.4 cv=VMnQXtPX c=1 sm=1 tr=0 ts=6948685e cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7CQSdrXTAAAA:8 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=zC5qE-s5kk4CCBLE0fQA:9 a=1OuFwYUASf3TG4hYMiVC:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-ORIG-GUID: GtF45QOB3TTMImfC67hbtnX3D1H-VYyC X-Proofpoint-GUID: GtF45QOB3TTMImfC67hbtnX3D1H-VYyC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-21_05,2025-12-19_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512210204 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) Signed-off-by: Robin Murphy Signed-off-by: Vijayanand Jitta Reviewed-by: Frank Li --- drivers/cdx/cdx_msi.c | 3 +-- drivers/iommu/of_iommu.c | 4 +--- drivers/irqchip/irq-gic-its-msi-parent.c | 4 ++-- 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, 23 insertions(+), 17 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 eb1473f1448a..0884c4cbd245 100644 --- a/drivers/irqchip/irq-gic-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-its-msi-parent.c @@ -166,7 +166,7 @@ static int of_pmsi_get_dev_id(struct irq_domain *domain= , struct device *dev, if (ret) { struct device_node *np =3D NULL; =20 - ret =3D of_map_id(dev->of_node, dev->id, "msi-map", "msi-map-mask", &np,= dev_id); + ret =3D of_map_msi_id(dev->of_node, dev->id, &np, dev_id); if (np) of_node_put(np); } @@ -211,7 +211,7 @@ static int of_v5_pmsi_get_msi_info(struct irq_domain *d= omain, struct device *dev if (ret) { struct device_node *np =3D NULL; =20 - ret =3D of_map_id(dev->of_node, dev->id, "msi-map", "msi-map-mask", &np,= dev_id); + ret =3D of_map_msi_id(dev->of_node, dev->id, &np, dev_id); if (np) { ret =3D its_translate_frame_address(np, pa); of_node_put(np); diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 1cd93549d093..9549dda8f9d6 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -725,8 +725,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 4668fc9648bf..c8da2e88e9c6 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1106,8 +1106,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 { @@ -1120,8 +1119,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 0380d300adca..ce21728d6e51 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -791,8 +791,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 29257d2639db..b661f9c1f4fe 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -321,8 +321,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 121a288ca92d..8cd486d89da2 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1435,6 +1435,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