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

Commit 4abc14a7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu-api: Rename ->{un}map function pointers to ->{un}map_range 



The new function pointer names match better with the
top-level functions of the iommu-api which are using them.
Main intention of this change is to make the ->{un}map
pointer names free for two new mapping functions.

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

arch/x86/kernel/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -2515,8 +2515,8 @@ static struct iommu_ops amd_iommu_ops = { 
	.domain_destroy = amd_iommu_domain_destroy,

	.attach_dev = amd_iommu_attach_device,

	.detach_dev = amd_iommu_detach_device,

	.map = amd_iommu_map_range,

	.unmap = amd_iommu_unmap_range,

	.map_range = amd_iommu_map_range,

	.unmap_range = amd_iommu_unmap_range,

	.iova_to_phys = amd_iommu_iova_to_phys,

	.domain_has_cap = amd_iommu_domain_has_cap,

};

drivers/base/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -83,14 +83,14 @@ EXPORT_SYMBOL_GPL(iommu_detach_device); 
int iommu_map_range(struct iommu_domain *domain, unsigned long iova,

		    phys_addr_t paddr, size_t size, int prot)

{

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

	return iommu_ops->map_range(domain, iova, paddr, size, prot);

}

EXPORT_SYMBOL_GPL(iommu_map_range);



void iommu_unmap_range(struct iommu_domain *domain, unsigned long iova,

		      size_t size)

{

	iommu_ops->unmap(domain, iova, size);

	iommu_ops->unmap_range(domain, iova, size);

}

EXPORT_SYMBOL_GPL(iommu_unmap_range);

drivers/pci/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -3714,8 +3714,8 @@ static struct iommu_ops intel_iommu_ops = { 
	.domain_destroy = intel_iommu_domain_destroy,

	.attach_dev	= intel_iommu_attach_device,

	.detach_dev	= intel_iommu_detach_device,

	.map		= intel_iommu_map_range,

	.unmap		= intel_iommu_unmap_range,

	.map_range	= intel_iommu_map_range,

	.unmap_range	= intel_iommu_unmap_range,

	.iova_to_phys	= intel_iommu_iova_to_phys,

	.domain_has_cap = intel_iommu_domain_has_cap,

};

include/linux/iommu.h

+4 −4
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ struct iommu_ops { 
	void (*domain_destroy)(struct iommu_domain *domain);

	int (*attach_dev)(struct iommu_domain *domain, struct device *dev);

	void (*detach_dev)(struct iommu_domain *domain, struct device *dev);

	int (*map)(struct iommu_domain *domain, unsigned long iova,

	int (*map_range)(struct iommu_domain *domain, unsigned long iova,

			 phys_addr_t paddr, size_t size, int prot);

	void (*unmap)(struct iommu_domain *domain, unsigned long iova,

	void (*unmap_range)(struct iommu_domain *domain, unsigned long iova,

			    size_t size);

	phys_addr_t (*iova_to_phys)(struct iommu_domain *domain,

				    unsigned long iova);