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

Commit ce2eb8f4 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/msm: Add iommu_group support 



As the last step to making groups mandatory, clean up the remaining
drivers by adding basic support. Whilst it may not perfectly reflect the
isolation capabilities of the hardware, using generic_device_group()
should at least maintain existing behaviour with respect to the API.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 6bd4f1c7

drivers/iommu/msm_iommu.c

+14 −1
Original line number Original line Diff line number Diff line
@@ -393,6 +393,7 @@ static struct msm_iommu_dev *find_iommu_for_dev(struct device *dev) 
static int msm_iommu_add_device(struct device *dev)

static int msm_iommu_add_device(struct device *dev)

{

{

	struct msm_iommu_dev *iommu;

	struct msm_iommu_dev *iommu;

	struct iommu_group *group;

	unsigned long flags;

	unsigned long flags;

	int ret = 0;

	int ret = 0;
@@ -406,7 +407,16 @@ static int msm_iommu_add_device(struct device *dev) 




	spin_unlock_irqrestore(&msm_iommu_lock, flags);

	spin_unlock_irqrestore(&msm_iommu_lock, flags);





	if (ret)

		return ret;

		return ret;



	group = iommu_group_get_for_dev(dev);

	if (IS_ERR(group))

		return PTR_ERR(group);



	iommu_group_put(group);



	return 0;

}

}





static void msm_iommu_remove_device(struct device *dev)

static void msm_iommu_remove_device(struct device *dev)
@@ -421,6 +431,8 @@ static void msm_iommu_remove_device(struct device *dev) 
		iommu_device_unlink(&iommu->iommu, dev);

		iommu_device_unlink(&iommu->iommu, dev);





	spin_unlock_irqrestore(&msm_iommu_lock, flags);

	spin_unlock_irqrestore(&msm_iommu_lock, flags);



	iommu_group_remove_device(dev);

}

}





static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)

static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
@@ -700,6 +712,7 @@ static struct iommu_ops msm_iommu_ops = { 
	.iova_to_phys = msm_iommu_iova_to_phys,

	.iova_to_phys = msm_iommu_iova_to_phys,

	.add_device = msm_iommu_add_device,

	.add_device = msm_iommu_add_device,

	.remove_device = msm_iommu_remove_device,

	.remove_device = msm_iommu_remove_device,

	.device_group = generic_device_group,

	.pgsize_bitmap = MSM_IOMMU_PGSIZES,

	.pgsize_bitmap = MSM_IOMMU_PGSIZES,

	.of_xlate = qcom_iommu_of_xlate,

	.of_xlate = qcom_iommu_of_xlate,

};

};