Commit 6c2ae7e2 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Joerg Roedel
Browse files

iommu/exynos: Rework iommu group initialization 



This patch replaces custom code in add_device implementation with
iommu_group_get_for_dev() call and provides the needed callback.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 81f70ba2

drivers/iommu/exynos-iommu.c

+16 −11
Original line number Diff line number Diff line
@@ -1114,28 +1114,32 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain, 
	return phys;

}



static struct iommu_group *get_device_iommu_group(struct device *dev)

{

	struct iommu_group *group;



	group = iommu_group_get(dev);

	if (!group)

		group = iommu_group_alloc();



	return group;

}



static int exynos_iommu_add_device(struct device *dev)

{

	struct iommu_group *group;

	int ret;



	if (!has_sysmmu(dev))

		return -ENODEV;



	group = iommu_group_get(dev);

	group = iommu_group_get_for_dev(dev);



	if (!group) {

		group = iommu_group_alloc();

		if (IS_ERR(group)) {

			dev_err(dev, "Failed to allocate IOMMU group\n");

	if (IS_ERR(group))

		return PTR_ERR(group);

		}

	}



	ret = iommu_group_add_device(group, dev);

	iommu_group_put(group);



	return ret;

	return 0;

}



static void exynos_iommu_remove_device(struct device *dev)
@@ -1182,6 +1186,7 @@ static struct iommu_ops exynos_iommu_ops = { 
	.unmap = exynos_iommu_unmap,

	.map_sg = default_iommu_map_sg,

	.iova_to_phys = exynos_iommu_iova_to_phys,

	.device_group = get_device_iommu_group,

	.add_device = exynos_iommu_add_device,

	.remove_device = exynos_iommu_remove_device,

	.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE