lkml.org 
[lkml]   [2018]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 3/7 v5] iommu: support iommu configuration for fsl-mc devices
From
Date
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;
>

\
 
 \ /
  Last update: 2018-07-03 17:31    [W:0.283 / U:1.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site