Commit 9a630a4b authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu: Split struct iommu_ops 



Move the domain specific operations out of struct iommu_ops into a new
structure that only has domain specific operations. This solves the
problem of needing to know if the method vector for a given operation
needs to be retrieved from the device or the domain. Logically the domain
ops are the ones that make sense for external subsystems and endpoint
drivers to use, while device ops, with the sole exception of domain_alloc,
are IOMMU API internals.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220216025249.3459465-10-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 41bb23e7

drivers/iommu/amd/iommu.c

+11 −9
Original line number Diff line number Diff line
@@ -2268,13 +2268,6 @@ static int amd_iommu_def_domain_type(struct device *dev) 
const struct iommu_ops amd_iommu_ops = {

	.capable = amd_iommu_capable,

	.domain_alloc = amd_iommu_domain_alloc,

	.domain_free  = amd_iommu_domain_free,

	.attach_dev = amd_iommu_attach_device,

	.detach_dev = amd_iommu_detach_device,

	.map = amd_iommu_map,

	.iotlb_sync_map	= amd_iommu_iotlb_sync_map,

	.unmap = amd_iommu_unmap,

	.iova_to_phys = amd_iommu_iova_to_phys,

	.probe_device = amd_iommu_probe_device,

	.release_device = amd_iommu_release_device,

	.probe_finalize = amd_iommu_probe_finalize,
@@ -2283,9 +2276,18 @@ const struct iommu_ops amd_iommu_ops = { 
	.put_resv_regions = generic_iommu_put_resv_regions,

	.is_attach_deferred = amd_iommu_is_attach_deferred,

	.pgsize_bitmap	= AMD_IOMMU_PGSIZES,

	.def_domain_type = amd_iommu_def_domain_type,

	.default_domain_ops = &(const struct iommu_domain_ops) {

		.attach_dev	= amd_iommu_attach_device,

		.detach_dev	= amd_iommu_detach_device,

		.map		= amd_iommu_map,

		.unmap		= amd_iommu_unmap,

		.iotlb_sync_map	= amd_iommu_iotlb_sync_map,

		.iova_to_phys	= amd_iommu_iova_to_phys,

		.flush_iotlb_all = amd_iommu_flush_iotlb_all,

		.iotlb_sync	= amd_iommu_iotlb_sync,

	.def_domain_type = amd_iommu_def_domain_type,

		.free		= amd_iommu_domain_free,

	}

};



/*****************************************************************************

drivers/iommu/apple-dart.c

+11 −9
Original line number Diff line number Diff line
@@ -765,15 +765,6 @@ static void apple_dart_get_resv_regions(struct device *dev, 


static const struct iommu_ops apple_dart_iommu_ops = {

	.domain_alloc = apple_dart_domain_alloc,

	.domain_free = apple_dart_domain_free,

	.attach_dev = apple_dart_attach_dev,

	.detach_dev = apple_dart_detach_dev,

	.map_pages = apple_dart_map_pages,

	.unmap_pages = apple_dart_unmap_pages,

	.flush_iotlb_all = apple_dart_flush_iotlb_all,

	.iotlb_sync = apple_dart_iotlb_sync,

	.iotlb_sync_map = apple_dart_iotlb_sync_map,

	.iova_to_phys = apple_dart_iova_to_phys,

	.probe_device = apple_dart_probe_device,

	.release_device = apple_dart_release_device,

	.device_group = apple_dart_device_group,
@@ -782,6 +773,17 @@ static const struct iommu_ops apple_dart_iommu_ops = { 
	.get_resv_regions = apple_dart_get_resv_regions,

	.put_resv_regions = generic_iommu_put_resv_regions,

	.pgsize_bitmap = -1UL, /* Restricted during dart probe */

	.default_domain_ops = &(const struct iommu_domain_ops) {

		.attach_dev	= apple_dart_attach_dev,

		.detach_dev	= apple_dart_detach_dev,

		.map_pages	= apple_dart_map_pages,

		.unmap_pages	= apple_dart_unmap_pages,

		.flush_iotlb_all = apple_dart_flush_iotlb_all,

		.iotlb_sync	= apple_dart_iotlb_sync,

		.iotlb_sync_map	= apple_dart_iotlb_sync_map,

		.iova_to_phys	= apple_dart_iova_to_phys,

		.free		= apple_dart_domain_free,

	}

};



static irqreturn_t apple_dart_irq(int irq, void *dev)

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+10 −8
Original line number Diff line number Diff line
@@ -2841,17 +2841,9 @@ static int arm_smmu_dev_disable_feature(struct device *dev, 
static struct iommu_ops arm_smmu_ops = {

	.capable		= arm_smmu_capable,

	.domain_alloc		= arm_smmu_domain_alloc,

	.domain_free		= arm_smmu_domain_free,

	.attach_dev		= arm_smmu_attach_dev,

	.map_pages		= arm_smmu_map_pages,

	.unmap_pages		= arm_smmu_unmap_pages,

	.flush_iotlb_all	= arm_smmu_flush_iotlb_all,

	.iotlb_sync		= arm_smmu_iotlb_sync,

	.iova_to_phys		= arm_smmu_iova_to_phys,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.device_group		= arm_smmu_device_group,

	.enable_nesting		= arm_smmu_enable_nesting,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.put_resv_regions	= generic_iommu_put_resv_regions,
@@ -2865,6 +2857,16 @@ static struct iommu_ops arm_smmu_ops = { 
	.page_response		= arm_smmu_page_response,

	.pgsize_bitmap		= -1UL, /* Restricted during device attach */

	.owner			= THIS_MODULE,

	.default_domain_ops = &(const struct iommu_domain_ops) {

		.attach_dev		= arm_smmu_attach_dev,

		.map_pages		= arm_smmu_map_pages,

		.unmap_pages		= arm_smmu_unmap_pages,

		.flush_iotlb_all	= arm_smmu_flush_iotlb_all,

		.iotlb_sync		= arm_smmu_iotlb_sync,

		.iova_to_phys		= arm_smmu_iova_to_phys,

		.enable_nesting		= arm_smmu_enable_nesting,

		.free			= arm_smmu_domain_free,

	}

};



/* Probing and initialisation functions */

drivers/iommu/arm/arm-smmu/arm-smmu.c

+11 −9
Original line number Diff line number Diff line
@@ -1583,25 +1583,27 @@ static int arm_smmu_def_domain_type(struct device *dev) 
static struct iommu_ops arm_smmu_ops = {

	.capable		= arm_smmu_capable,

	.domain_alloc		= arm_smmu_domain_alloc,

	.domain_free		= arm_smmu_domain_free,

	.attach_dev		= arm_smmu_attach_dev,

	.map_pages		= arm_smmu_map_pages,

	.unmap_pages		= arm_smmu_unmap_pages,

	.flush_iotlb_all	= arm_smmu_flush_iotlb_all,

	.iotlb_sync		= arm_smmu_iotlb_sync,

	.iova_to_phys		= arm_smmu_iova_to_phys,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.probe_finalize		= arm_smmu_probe_finalize,

	.device_group		= arm_smmu_device_group,

	.enable_nesting		= arm_smmu_enable_nesting,

	.set_pgtable_quirks	= arm_smmu_set_pgtable_quirks,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.put_resv_regions	= generic_iommu_put_resv_regions,

	.def_domain_type	= arm_smmu_def_domain_type,

	.pgsize_bitmap		= -1UL, /* Restricted during device attach */

	.owner			= THIS_MODULE,

	.default_domain_ops = &(const struct iommu_domain_ops) {

		.attach_dev		= arm_smmu_attach_dev,

		.map_pages		= arm_smmu_map_pages,

		.unmap_pages		= arm_smmu_unmap_pages,

		.flush_iotlb_all	= arm_smmu_flush_iotlb_all,

		.iotlb_sync		= arm_smmu_iotlb_sync,

		.iova_to_phys		= arm_smmu_iova_to_phys,

		.enable_nesting		= arm_smmu_enable_nesting,

		.set_pgtable_quirks	= arm_smmu_set_pgtable_quirks,

		.free			= arm_smmu_domain_free,

	}

};



static void arm_smmu_device_reset(struct arm_smmu_device *smmu)

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+10 −8
Original line number Diff line number Diff line
@@ -590,7 +590,12 @@ static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) 
static const struct iommu_ops qcom_iommu_ops = {

	.capable	= qcom_iommu_capable,

	.domain_alloc	= qcom_iommu_domain_alloc,

	.domain_free	= qcom_iommu_domain_free,

	.probe_device	= qcom_iommu_probe_device,

	.release_device	= qcom_iommu_release_device,

	.device_group	= generic_device_group,

	.of_xlate	= qcom_iommu_of_xlate,

	.pgsize_bitmap	= SZ_4K | SZ_64K | SZ_1M | SZ_16M,

	.default_domain_ops = &(const struct iommu_domain_ops) {

		.attach_dev	= qcom_iommu_attach_dev,

		.detach_dev	= qcom_iommu_detach_dev,

		.map		= qcom_iommu_map,
@@ -598,11 +603,8 @@ static const struct iommu_ops qcom_iommu_ops = { 
		.flush_iotlb_all = qcom_iommu_flush_iotlb_all,

		.iotlb_sync	= qcom_iommu_iotlb_sync,

		.iova_to_phys	= qcom_iommu_iova_to_phys,

	.probe_device	= qcom_iommu_probe_device,

	.release_device	= qcom_iommu_release_device,

	.device_group	= generic_device_group,

	.of_xlate	= qcom_iommu_of_xlate,

	.pgsize_bitmap	= SZ_4K | SZ_64K | SZ_1M | SZ_16M,

		.free		= qcom_iommu_domain_free,

	}

};



static int qcom_iommu_sec_ptbl_init(struct device *dev)