Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e251a4 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Will Deacon
Browse files

iommu: Drop the of_iommu_{set/get}_ops() interface 



With the introduction of the new iommu_{register/get}_instance()
interface in commit e4f10ffe ("iommu: Make of_iommu_set/get_ops() DT
agnostic") (based on struct fwnode_handle as look-up token, so firmware
agnostic) to register IOMMU instances with the core IOMMU layer there is
no reason to keep the old OF based interface around any longer.

Convert all the IOMMU drivers (and OF IOMMU core code) that rely on the
of_iommu_{set/get}_ops() to the new kernel interface to register/retrieve
IOMMU instances and remove the of_iommu_{set/get}_ops() remaining glue
code in order to complete the interface rework.

Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Tested-by: default avatarSricharan R <sricharan@codeaurora.org>
Tested-by: default avatarYong Wu <yong.wu@mediatek.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 692c4e42

drivers/iommu/exynos-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) 


	pm_runtime_enable(dev);



	of_iommu_set_ops(dev->of_node, &exynos_iommu_ops);

	iommu_register_instance(dev->fwnode, &exynos_iommu_ops);



	return 0;

}

drivers/iommu/msm_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int msm_iommu_probe(struct platform_device *pdev) 
	}



	list_add(&iommu->dev_node, &qcom_iommu_devices);

	of_iommu_set_ops(pdev->dev.of_node, &msm_iommu_ops);

	iommu_register_instance(pdev->dev.fwnode, &msm_iommu_ops);



	pr_info("device mapped at %p, irq %d with %d ctx banks\n",

		iommu->base, iommu->irq, iommu->ncb);

drivers/iommu/mtk_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int mtk_iommu_init_fn(struct device_node *np) 
		return ret;

	}



	of_iommu_set_ops(np, &mtk_iommu_ops);

	iommu_register_instance(&np->fwnode, &mtk_iommu_ops);

	return 0;

}

drivers/iommu/of_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static const struct iommu_ops 
			   "iommu-map-mask", &iommu_spec.np, iommu_spec.args))

		return NULL;



	ops = of_iommu_get_ops(iommu_spec.np);

	ops = iommu_get_instance(&iommu_spec.np->fwnode);

	if (!ops || !ops->of_xlate ||

	    iommu_fwspec_init(&pdev->dev, &iommu_spec.np->fwnode, ops) ||

	    ops->of_xlate(&pdev->dev, &iommu_spec))
@@ -157,7 +157,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, 
					   "#iommu-cells", idx,

					   &iommu_spec)) {

		np = iommu_spec.np;

		ops = of_iommu_get_ops(np);

		ops = iommu_get_instance(&np->fwnode);



		if (!ops || !ops->of_xlate ||

		    iommu_fwspec_init(dev, &np->fwnode, ops) ||

include/linux/of_iommu.h

+0 −11
Original line number Diff line number Diff line
@@ -31,17 +31,6 @@ static inline const struct iommu_ops *of_iommu_configure(struct device *dev, 


#endif	/* CONFIG_OF_IOMMU */



static inline void of_iommu_set_ops(struct device_node *np,

				    const struct iommu_ops *ops)

{

	iommu_register_instance(&np->fwnode, ops);

}



static inline const struct iommu_ops *of_iommu_get_ops(struct device_node *np)

{

	return iommu_get_instance(&np->fwnode);

}



extern struct of_device_id __iommu_of_table;



typedef int (*of_iommu_init_fn)(struct device_node *);