From: Frank Li <Frank.li@nxp.com>
To: Vijayanand Jitta <vijayanand.jitta@oss.qualcomm.com>
Cc: 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, iommu@lists.linux.dev,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: Re: [PATCH v3 1/3] of: Add convenience wrappers for of_map_id()
Date: Tue, 30 Dec 2025 10:29:10 -0500 [thread overview]
Message-ID: <aVPvxtrzo0WcHsRy@lizhi-Precision-Tower-5810> (raw)
In-Reply-To: <20251221213602.2413124-2-vijayanand.jitta@oss.qualcomm.com>
On Mon, Dec 22, 2025 at 03:06:00AM +0530, Vijayanand Jitta wrote:
> From: Robin Murphy <robin.murphy@arm.com>
>
> 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) <robh@kernel.org>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Vijayanand Jitta <vijayanand.jitta@oss.qualcomm.com>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> 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_domain,
> int ret;
>
> /* Retrieve device ID from requestor ID using parent device */
> - ret = of_map_id(parent->of_node, cdx_dev->msi_dev_id, "msi-map", "msi-map-mask",
> - NULL, &dev_id);
> + ret = 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 = { .args_count = 1 };
> int err;
>
> - err = of_map_id(master_np, *id, "iommu-map",
> - "iommu-map-mask", &iommu_spec.np,
> - iommu_spec.args);
> + err = of_map_iommu_id(master_np, *id, &iommu_spec.np, iommu_spec.args);
> if (err)
> return err;
>
> 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 = NULL;
>
> - ret = of_map_id(dev->of_node, dev->id, "msi-map", "msi-map-mask", &np, dev_id);
> + ret = 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 *domain, struct device *dev
> if (ret) {
> struct device_node *np = NULL;
>
> - ret = of_map_id(dev->of_node, dev->id, "msi-map", "msi-map-mask", &np, dev_id);
> + ret = of_map_msi_id(dev->of_node, dev->id, &np, dev_id);
> if (np) {
> ret = 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 = dev; parent_dev; parent_dev = 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 *imx_pcie, u32 rid)
> u32 sid = 0;
>
> target = NULL;
> - err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask",
> - &target, &sid_i);
> + err_i = 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 *imx_pcie, u32 rid)
> }
>
> target = NULL;
> - err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask",
> - &target, &sid_m);
> + err_m = of_map_msi_id(dev->of_node, rid, &target, &sid_m);
>
> /*
> * err_m target
> diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-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_bridge *bridge, struct pci_d
> dev_dbg(&pdev->dev, "added to bus %s, index %d\n",
> pci_name(pdev->bus->self), port->idx);
>
> - err = of_map_id(port->pcie->dev->of_node, rid, "iommu-map",
> - "iommu-map-mask", NULL, &sid);
> + err = of_map_iommu_id(port->pcie->dev->of_node, rid, NULL, &sid);
> if (err)
> return err;
>
> 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 device *dev,
> struct pci_dev *pdev = to_pci_dev(dev);
> u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);
>
> - 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);
> }
>
> +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 = of_phandle_iterator_next(it); \
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-12-30 15:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-21 21:35 [PATCH v3 0/3] of: parsing of multi #{iommu,msi}-cells in maps Vijayanand Jitta
2025-12-21 21:36 ` [PATCH v3 1/3] of: Add convenience wrappers for of_map_id() Vijayanand Jitta
2025-12-30 15:29 ` Frank Li [this message]
2025-12-21 21:36 ` [PATCH v3 2/3] of: factor arguments passed to of_map_id() into a struct Vijayanand Jitta
2025-12-24 3:37 ` kernel test robot
2025-12-24 3:37 ` kernel test robot
2025-12-21 21:36 ` [PATCH v3 3/3] of: Respect #{iommu,msi}-cells in maps Vijayanand Jitta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aVPvxtrzo0WcHsRy@lizhi-Precision-Tower-5810 \
--to=frank.li@nxp.com \
--cc=bjorn.andersson@oss.qualcomm.com \
--cc=bod@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=konrad.dybcio@oss.qualcomm.com \
--cc=krzk+dt@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=prakash.gupta@oss.qualcomm.com \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=saravanak@google.com \
--cc=vijayanand.jitta@oss.qualcomm.com \
--cc=vikash.garodia@oss.qualcomm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®