iommu/mediatek-v1 Convert to probe/release_device() call-backs (57dbf81f) · Commits · 戴 / test

drivers/iommu/mtk_iommu_v1.c

+20 −30

Original line number	Diff line number	Diff line
		@@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
		return 0;
		}

		static int mtk_iommu_add_device(struct device *dev)
		static struct iommu_device mtk_iommu_probe_device(struct device dev)
		{
		struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
		struct dma_iommu_mapping *mtk_mapping;
		struct of_phandle_args iommu_spec;
		struct of_phandle_iterator it;
		struct mtk_iommu_data *data;
		struct iommu_group *group;
		int err;

		of_for_each_phandle(&it, err, dev->of_node, "iommus",
		@@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
		}

		if (!fwspec \|\| fwspec->ops != &mtk_iommu_ops)
		return -ENODEV; /* Not a iommu client device */
		return ERR_PTR(-ENODEV); /* Not a iommu client device */

		/*
		* This is a short-term bodge because the ARM DMA code doesn't
		* understand multi-device groups, but we have to call into it
		* successfully (and not just rely on a normal IOMMU API attach
		* here) in order to set the correct DMA API ops on @dev.
		*/
		group = iommu_group_alloc();
		if (IS_ERR(group))
		return PTR_ERR(group);
		data = dev_iommu_priv_get(dev);

		err = iommu_group_add_device(group, dev);
		iommu_group_put(group);
		if (err)
		return err;
		return &data->iommu;
		}

		static void mtk_iommu_probe_finalize(struct device *dev)
		{
		struct dma_iommu_mapping *mtk_mapping;
		struct mtk_iommu_data *data;
		int err;

		data = dev_iommu_priv_get(dev);
		mtk_mapping = data->dev->archdata.iommu;
		err = arm_iommu_attach_device(dev, mtk_mapping);
		if (err) {
		iommu_group_remove_device(dev);
		return err;
		}

		return iommu_device_link(&data->iommu, dev);
		err = arm_iommu_attach_device(dev, mtk_mapping);
		if (err)
		dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
		}

		static void mtk_iommu_remove_device(struct device *dev)
		static void mtk_iommu_release_device(struct device *dev)
		{
		struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
		struct mtk_iommu_data *data;
		@@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
		return;

		data = dev_iommu_priv_get(dev);
		iommu_device_unlink(&data->iommu, dev);

		iommu_group_remove_device(dev);
		iommu_fwspec_free(dev);
		}

		@@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
		.map = mtk_iommu_map,
		.unmap = mtk_iommu_unmap,
		.iova_to_phys = mtk_iommu_iova_to_phys,
		.add_device = mtk_iommu_add_device,
		.remove_device = mtk_iommu_remove_device,
		.probe_device = mtk_iommu_probe_device,
		.probe_finalize = mtk_iommu_probe_finalize,
		.release_device = mtk_iommu_release_device,
		.device_group = generic_device_group,
		.pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
		};

Admin message