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

iommu: Finish making iommu_group support mandatory 



Now that all the drivers properly implementing the IOMMU API support
groups (I'm ignoring the etnaviv GPU MMUs which seemingly only do just
enough to convince the ARM DMA mapping ops), we can remove the FIXME
workarounds from the core code. In the process, it also seems logical to
make the .device_group callback non-optional for drivers calling
iommu_group_get_for_dev() - the current callers all implement it anyway,
and it doesn't make sense for any future callers not to either.

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

drivers/iommu/iommu.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -1005,11 +1005,10 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) 
	if (group)

	if (group)

		return group;

		return group;





	group = ERR_PTR(-EINVAL);

	if (!ops)

		return ERR_PTR(-EINVAL);





	if (ops && ops->device_group)

	group = ops->device_group(dev);

	group = ops->device_group(dev);



	if (WARN_ON_ONCE(group == NULL))

	if (WARN_ON_ONCE(group == NULL))

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);
@@ -1298,12 +1297,8 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev) 
	int ret;

	int ret;





	group = iommu_group_get(dev);

	group = iommu_group_get(dev);

	/* FIXME: Remove this when groups a mandatory for iommu drivers */

	if (group == NULL)

		return __iommu_attach_device(domain, dev);



	/*

	/*

	 * We have a group - lock it to make sure the device-count doesn't

	 * Lock the group to make sure the device-count doesn't

	 * change while we are attaching

	 * change while we are attaching

	 */

	 */

	mutex_lock(&group->mutex);

	mutex_lock(&group->mutex);
@@ -1336,9 +1331,6 @@ void iommu_detach_device(struct iommu_domain *domain, struct device *dev) 
	struct iommu_group *group;

	struct iommu_group *group;





	group = iommu_group_get(dev);

	group = iommu_group_get(dev);

	/* FIXME: Remove this when groups a mandatory for iommu drivers */

	if (group == NULL)

		return __iommu_detach_device(domain, dev);





	mutex_lock(&group->mutex);

	mutex_lock(&group->mutex);

	if (iommu_group_device_count(group) != 1) {

	if (iommu_group_device_count(group) != 1) {
@@ -1360,9 +1352,6 @@ struct iommu_domain *iommu_get_domain_for_dev(struct device *dev) 
	struct iommu_group *group;

	struct iommu_group *group;





	group = iommu_group_get(dev);

	group = iommu_group_get(dev);

	/* FIXME: Remove this when groups a mandatory for iommu drivers */

	if (group == NULL)

		return NULL;





	domain = group->domain;

	domain = group->domain;

CRA Git | Maintained and supported by SUSTech CRA and CCSE