Commit ef181762 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu/arm-smmu-v3: Make the blocked domain support PASID 



The blocked domain is used to park RID to be blocking DMA state. This
can be extended to PASID as well. By this, the remove_dev_pasid() op
of ARM SMMUv3 can be dropped.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241204122928.11987-5-yi.l.liu@intel.com


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

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

+6 −6
Original line number Diff line number Diff line
@@ -3016,13 +3016,12 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master, 
	return ret;

}



static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid,

				      struct iommu_domain *domain)

static int arm_smmu_blocking_set_dev_pasid(struct iommu_domain *new_domain,

					   struct device *dev, ioasid_t pasid,

					   struct iommu_domain *old_domain)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(old_domain);

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);

	struct arm_smmu_domain *smmu_domain;



	smmu_domain = to_smmu_domain(domain);



	mutex_lock(&arm_smmu_asid_lock);

	arm_smmu_clear_cd(master, pasid);
@@ -3043,6 +3042,7 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid, 
		    sid_domain->type == IOMMU_DOMAIN_BLOCKED)

			sid_domain->ops->attach_dev(sid_domain, dev);

	}

	return 0;

}



static void arm_smmu_attach_dev_ste(struct iommu_domain *domain,
@@ -3124,6 +3124,7 @@ static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain, 


static const struct iommu_domain_ops arm_smmu_blocked_ops = {

	.attach_dev = arm_smmu_attach_dev_blocked,

	.set_dev_pasid = arm_smmu_blocking_set_dev_pasid,

};



static struct iommu_domain arm_smmu_blocked_domain = {
@@ -3551,7 +3552,6 @@ static struct iommu_ops arm_smmu_ops = { 
	.device_group		= arm_smmu_device_group,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.remove_dev_pasid	= arm_smmu_remove_dev_pasid,

	.dev_enable_feat	= arm_smmu_dev_enable_feature,

	.dev_disable_feat	= arm_smmu_dev_disable_feature,

	.page_response		= arm_smmu_page_response,