Commit dea74f1c authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/msm: Convert to probe/release_device() call-backs 



Convert the MSM IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200429133712.31431-22-joro@8bytes.org


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 21acf659

drivers/iommu/msm_iommu.c

+7 −27
Original line number Diff line number Diff line
@@ -388,43 +388,23 @@ static struct msm_iommu_dev *find_iommu_for_dev(struct device *dev) 
	return ret;

}



static int msm_iommu_add_device(struct device *dev)

static struct iommu_device *msm_iommu_probe_device(struct device *dev)

{

	struct msm_iommu_dev *iommu;

	struct iommu_group *group;

	unsigned long flags;



	spin_lock_irqsave(&msm_iommu_lock, flags);

	iommu = find_iommu_for_dev(dev);

	spin_unlock_irqrestore(&msm_iommu_lock, flags);



	if (iommu)

		iommu_device_link(&iommu->iommu, dev);

	else

		return -ENODEV;



	group = iommu_group_get_for_dev(dev);

	if (IS_ERR(group))

		return PTR_ERR(group);



	iommu_group_put(group);

	if (!iommu)

		return ERR_PTR(-ENODEV);



	return 0;

	return &iommu->iommu;

}



static void msm_iommu_remove_device(struct device *dev)

static void msm_iommu_release_device(struct device *dev)

{

	struct msm_iommu_dev *iommu;

	unsigned long flags;



	spin_lock_irqsave(&msm_iommu_lock, flags);

	iommu = find_iommu_for_dev(dev);

	spin_unlock_irqrestore(&msm_iommu_lock, flags);



	if (iommu)

		iommu_device_unlink(&iommu->iommu, dev);



	iommu_group_remove_device(dev);

}



static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
@@ -708,8 +688,8 @@ static struct iommu_ops msm_iommu_ops = { 
	 */

	.iotlb_sync = NULL,

	.iova_to_phys = msm_iommu_iova_to_phys,

	.add_device = msm_iommu_add_device,

	.remove_device = msm_iommu_remove_device,

	.probe_device = msm_iommu_probe_device,

	.release_device = msm_iommu_release_device,

	.device_group = generic_device_group,

	.pgsize_bitmap = MSM_IOMMU_PGSIZES,

	.of_xlate = qcom_iommu_of_xlate,