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

iommu/arm-smmu-v3: Make set_dev_pasid() op support replace 



set_dev_pasid() op is going to be enhanced to support domain replacement
of a pasid. This prepares for this op definition.

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


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 67f6f56b

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

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain, 
	 * get reassigned

	 */

	arm_smmu_make_sva_cd(&target, master, domain->mm, smmu_domain->cd.asid);

	ret = arm_smmu_set_pasid(master, smmu_domain, id, &target);

	ret = arm_smmu_set_pasid(master, smmu_domain, id, &target, old);



	mmput(domain->mm);

	return ret;

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

+3 −6
Original line number Diff line number Diff line
@@ -2883,7 +2883,7 @@ static int arm_smmu_s1_set_dev_pasid(struct iommu_domain *domain, 
	 */

	arm_smmu_make_s1_cd(&target_cd, master, smmu_domain);

	return arm_smmu_set_pasid(master, to_smmu_domain(domain), id,

				  &target_cd);

				  &target_cd, old);

}



static void arm_smmu_update_ste(struct arm_smmu_master *master,
@@ -2913,16 +2913,13 @@ static void arm_smmu_update_ste(struct arm_smmu_master *master, 


int arm_smmu_set_pasid(struct arm_smmu_master *master,

		       struct arm_smmu_domain *smmu_domain, ioasid_t pasid,

		       struct arm_smmu_cd *cd)

		       struct arm_smmu_cd *cd, struct iommu_domain *old)

{

	struct iommu_domain *sid_domain = iommu_get_domain_for_dev(master->dev);

	struct arm_smmu_attach_state state = {

		.master = master,

		/*

		 * For now the core code prevents calling this when a domain is

		 * already attached, no need to set old_domain.

		 */

		.ssid = pasid,

		.old_domain = old,

	};

	struct arm_smmu_cd *cdptr;

	int ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ void arm_smmu_write_cd_entry(struct arm_smmu_master *master, int ssid, 


int arm_smmu_set_pasid(struct arm_smmu_master *master,

		       struct arm_smmu_domain *smmu_domain, ioasid_t pasid,

		       struct arm_smmu_cd *cd);

		       struct arm_smmu_cd *cd, struct iommu_domain *old);



void arm_smmu_tlb_inv_asid(struct arm_smmu_device *smmu, u16 asid);

void arm_smmu_tlb_inv_range_asid(unsigned long iova, size_t size, int asid,