From: Robin Murphy <robin.murphy@arm.com>
To: Nipun Gupta <nipun.gupta@nxp.com>,
will.deacon@arm.com, robh+dt@kernel.org, robh@kernel.org,
mark.rutland@arm.com, catalin.marinas@arm.com,
gregkh@linuxfoundation.org, laurentiu.tudor@nxp.com,
bhelgaas@google.com
Cc: hch@lst.de, joro@8bytes.org, m.szyprowski@samsung.com,
shawnguo@kernel.org, frowand.list@gmail.com,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org,
bharat.bhushan@nxp.com, stuyoder@gmail.com, leoyang.li@nxp.com
Subject: Re: [PATCH 3/7 v5] iommu: support iommu configuration for fsl-mc devices
Date: Tue, 3 Jul 2018 16:30:35 +0100 [thread overview]
Message-ID: <947a6e16-98ff-9389-b15c-d3025b7be4be@arm.com> (raw)
In-Reply-To: <1526824191-7000-4-git-send-email-nipun.gupta@nxp.com>
On 20/05/18 14:49, Nipun Gupta wrote:
> With of_pci_map_rid available for all the busses, use the function
> for configuration of devices on fsl-mc bus
FWIW I had a quick hack at factoring out the commonality with
of_pci_iommu_init(), at which point I reckon this change is easier to
follow as-is for the moment, so:
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
> ---
> drivers/iommu/of_iommu.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
> index 811e160..284474d 100644
> --- a/drivers/iommu/of_iommu.c
> +++ b/drivers/iommu/of_iommu.c
> @@ -24,6 +24,7 @@
> #include <linux/of_iommu.h>
> #include <linux/of_pci.h>
> #include <linux/slab.h>
> +#include <linux/fsl/mc.h>
>
> #define NO_IOMMU 1
>
> @@ -159,6 +160,23 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
> return err;
> }
>
> +static int of_fsl_mc_iommu_init(struct fsl_mc_device *mc_dev,
> + struct device_node *master_np)
> +{
> + struct of_phandle_args iommu_spec = { .args_count = 1 };
> + int err;
> +
> + err = of_map_rid(master_np, mc_dev->icid, "iommu-map",
> + "iommu-map-mask", &iommu_spec.np,
> + iommu_spec.args);
> + if (err)
> + return err == -ENODEV ? NO_IOMMU : err;
> +
> + err = of_iommu_xlate(&mc_dev->dev, &iommu_spec);
> + of_node_put(iommu_spec.np);
> + return err;
> +}
> +
> const struct iommu_ops *of_iommu_configure(struct device *dev,
> struct device_node *master_np)
> {
> @@ -190,6 +208,8 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
>
> err = pci_for_each_dma_alias(to_pci_dev(dev),
> of_pci_iommu_init, &info);
> + } else if (dev_is_fsl_mc(dev)) {
> + err = of_fsl_mc_iommu_init(to_fsl_mc_device(dev), master_np);
> } else {
> struct of_phandle_args iommu_spec;
> int idx = 0;
>
next prev parent reply other threads:[~2018-07-03 15:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-20 13:49 [PATCH 0/7 v5] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
2018-05-20 13:49 ` [PATCH 1/7 v5] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-07-03 14:39 ` Robin Murphy
2018-07-06 12:10 ` Nipun Gupta
2018-05-20 13:49 ` [PATCH 2/7 v5] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-07-03 14:41 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 3/7 v5] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
2018-07-03 15:30 ` Robin Murphy [this message]
2018-05-20 13:49 ` [PATCH 4/7 v5] iommu: arm-smmu: Add support for the fsl-mc bus Nipun Gupta
2018-07-03 16:01 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 5/7 v5] bus: fsl-mc: support dma configure for devices on " Nipun Gupta
2018-07-03 16:14 ` Robin Murphy
2018-07-06 12:17 ` Nipun Gupta
2018-05-20 13:49 ` [PATCH 6/7 v5] bus: fsl-mc: set coherent dma mask " Nipun Gupta
2018-05-22 7:03 ` Laurentiu Tudor
2018-07-03 16:15 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 7/7 v5] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
2018-07-03 16:35 ` Robin Murphy
2018-07-06 12:18 ` Nipun Gupta
2018-06-21 3:59 ` [PATCH 0/7 v5] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
2018-06-21 11:40 ` Will Deacon
2018-07-06 11:13 ` joro
2018-07-06 11:18 ` Nipun Gupta
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=947a6e16-98ff-9389-b15c-d3025b7be4be@arm.com \
--to=robin.murphy@arm.com \
--cc=bharat.bhushan@nxp.com \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=nipun.gupta@nxp.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=shawnguo@kernel.org \
--cc=stuyoder@gmail.com \
--cc=will.deacon@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).