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

iommu/core: Use bus->iommu_ops in the iommu-api 



Use the per-bus iommu-ops in the functions of the iommu-api
instead of the global iommu_ops.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent a1b60c1c

drivers/iommu/iommu.c

+27 −7
Original line number Diff line number Diff line
@@ -110,34 +110,48 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc); 


void iommu_domain_free(struct iommu_domain *domain)

{

	iommu_ops->domain_destroy(domain);

	if (likely(domain->ops->domain_destroy != NULL))

		domain->ops->domain_destroy(domain);



	kfree(domain);

}

EXPORT_SYMBOL_GPL(iommu_domain_free);



int iommu_attach_device(struct iommu_domain *domain, struct device *dev)

{

	return iommu_ops->attach_dev(domain, dev);

	if (unlikely(domain->ops->attach_dev == NULL))

		return -ENODEV;



	return domain->ops->attach_dev(domain, dev);

}

EXPORT_SYMBOL_GPL(iommu_attach_device);



void iommu_detach_device(struct iommu_domain *domain, struct device *dev)

{

	iommu_ops->detach_dev(domain, dev);

	if (unlikely(domain->ops->detach_dev == NULL))

		return;



	domain->ops->detach_dev(domain, dev);

}

EXPORT_SYMBOL_GPL(iommu_detach_device);



phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,

			       unsigned long iova)

{

	return iommu_ops->iova_to_phys(domain, iova);

	if (unlikely(domain->ops->iova_to_phys == NULL))

		return 0;



	return domain->ops->iova_to_phys(domain, iova);

}

EXPORT_SYMBOL_GPL(iommu_iova_to_phys);



int iommu_domain_has_cap(struct iommu_domain *domain,

			 unsigned long cap)

{

	return iommu_ops->domain_has_cap(domain, cap);

	if (unlikely(domain->ops->domain_has_cap == NULL))

		return 0;



	return domain->ops->domain_has_cap(domain, cap);

}

EXPORT_SYMBOL_GPL(iommu_domain_has_cap);
@@ -146,11 +160,14 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, 
{

	size_t size;



	if (unlikely(domain->ops->map == NULL))

		return -ENODEV;



	size         = PAGE_SIZE << gfp_order;



	BUG_ON(!IS_ALIGNED(iova | paddr, size));



	return iommu_ops->map(domain, iova, paddr, gfp_order, prot);

	return domain->ops->map(domain, iova, paddr, gfp_order, prot);

}

EXPORT_SYMBOL_GPL(iommu_map);
@@ -158,10 +175,13 @@ int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order) 
{

	size_t size;



	if (unlikely(domain->ops->unmap == NULL))

		return -ENODEV;



	size         = PAGE_SIZE << gfp_order;



	BUG_ON(!IS_ALIGNED(iova, size));



	return iommu_ops->unmap(domain, iova, gfp_order);

	return domain->ops->unmap(domain, iova, gfp_order);

}

EXPORT_SYMBOL_GPL(iommu_unmap);