Commit 0929deca authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/s390: Use iommu_group_get_for_dev() in s390_iommu_add_device() 



The iommu_group_get_for_dev() function also attaches the
device to its group, so this code doesn't need to be in the
iommu driver.

Further by using this function the driver can make use of
default domains in the future.

Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c0bc126f

drivers/iommu/s390-iommu.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -165,20 +165,14 @@ static void s390_iommu_detach_device(struct iommu_domain *domain, 




static int s390_iommu_add_device(struct device *dev)

static int s390_iommu_add_device(struct device *dev)

{

{

	struct iommu_group *group;

	struct iommu_group *group = iommu_group_get_for_dev(dev);

	int rc;





	group = iommu_group_get(dev);

	if (!group) {

		group = iommu_group_alloc();

	if (IS_ERR(group))

	if (IS_ERR(group))

		return PTR_ERR(group);

		return PTR_ERR(group);

	}





	rc = iommu_group_add_device(group, dev);

	iommu_group_put(group);

	iommu_group_put(group);





	return rc;

	return 0;

}

}





static void s390_iommu_remove_device(struct device *dev)

static void s390_iommu_remove_device(struct device *dev)
@@ -344,6 +338,7 @@ static struct iommu_ops s390_iommu_ops = { 
	.iova_to_phys = s390_iommu_iova_to_phys,

	.iova_to_phys = s390_iommu_iova_to_phys,

	.add_device = s390_iommu_add_device,

	.add_device = s390_iommu_add_device,

	.remove_device = s390_iommu_remove_device,

	.remove_device = s390_iommu_remove_device,

	.device_group = generic_device_group,

	.pgsize_bitmap = S390_IOMMU_PGSIZES,

	.pgsize_bitmap = S390_IOMMU_PGSIZES,

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE