Commit 678d79b9 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Will Deacon
Browse files

iommu/arm-smmu-v3: Convert to domain_alloc_sva() 



This allows the driver the receive the mm and always a device during
allocation. Later patches need this to properly setup the notifier when
the domain is first allocated.

Remove ops->domain_alloc() as SVA was the only remaining purpose.

Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Tested-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: default avatarMichael Shavit <mshavit@google.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/1-v9-5cd718286059+79186-smmuv3_newapi_p2b_jgg@nvidia.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 16c0bad7

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

+4 −2
Original line number Diff line number Diff line
@@ -656,13 +656,15 @@ static const struct iommu_domain_ops arm_smmu_sva_domain_ops = { 
	.free			= arm_smmu_sva_domain_free

};



struct iommu_domain *arm_smmu_sva_domain_alloc(void)

struct iommu_domain *arm_smmu_sva_domain_alloc(struct device *dev,

					       struct mm_struct *mm)

{

	struct iommu_domain *domain;



	domain = kzalloc(sizeof(*domain), GFP_KERNEL);

	if (!domain)

		return NULL;

		return ERR_PTR(-ENOMEM);

	domain->type = IOMMU_DOMAIN_SVA;

	domain->ops = &arm_smmu_sva_domain_ops;



	return domain;

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

+1 −9
Original line number Diff line number Diff line
@@ -2237,14 +2237,6 @@ static bool arm_smmu_capable(struct device *dev, enum iommu_cap cap) 
	}

}



static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)

{



	if (type == IOMMU_DOMAIN_SVA)

		return arm_smmu_sva_domain_alloc();

	return ERR_PTR(-EOPNOTSUPP);

}



static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev)

{

	struct arm_smmu_domain *smmu_domain;
@@ -3097,8 +3089,8 @@ static struct iommu_ops arm_smmu_ops = { 
	.identity_domain	= &arm_smmu_identity_domain,

	.blocked_domain		= &arm_smmu_blocked_domain,

	.capable		= arm_smmu_capable,

	.domain_alloc		= arm_smmu_domain_alloc,

	.domain_alloc_paging    = arm_smmu_domain_alloc_paging,

	.domain_alloc_sva       = arm_smmu_sva_domain_alloc,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.device_group		= arm_smmu_device_group,

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

+3 −5
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ int arm_smmu_master_enable_sva(struct arm_smmu_master *master); 
int arm_smmu_master_disable_sva(struct arm_smmu_master *master);

bool arm_smmu_master_iopf_supported(struct arm_smmu_master *master);

void arm_smmu_sva_notifier_synchronize(void);

struct iommu_domain *arm_smmu_sva_domain_alloc(void);

struct iommu_domain *arm_smmu_sva_domain_alloc(struct device *dev,

					       struct mm_struct *mm);

void arm_smmu_sva_remove_dev_pasid(struct iommu_domain *domain,

				   struct device *dev, ioasid_t id);

#else /* CONFIG_ARM_SMMU_V3_SVA */
@@ -838,10 +839,7 @@ static inline bool arm_smmu_master_iopf_supported(struct arm_smmu_master *master 


static inline void arm_smmu_sva_notifier_synchronize(void) {}



static inline struct iommu_domain *arm_smmu_sva_domain_alloc(void)

{

	return NULL;

}

#define arm_smmu_sva_domain_alloc NULL



static inline void arm_smmu_sva_remove_dev_pasid(struct iommu_domain *domain,

						 struct device *dev,