Commit 52f77fb1 authored by Nicolin Chen's avatar Nicolin Chen Committed by Joerg Roedel
Browse files

iommu/arm-smmu-v3: Set release_domain to arm_smmu_blocked_domain 



Since the core now takes care of the require_direct case for the release
domain, simply use that via the release_domain op.

Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent e9416048

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

+1 −6
Original line number Diff line number Diff line
@@ -3582,12 +3582,6 @@ static void arm_smmu_release_device(struct device *dev) 


	WARN_ON(master->iopf_refcount);



	/* Put the STE back to what arm_smmu_init_strtab() sets */

	if (dev->iommu->require_direct)

		arm_smmu_attach_dev_identity(&arm_smmu_identity_domain, dev);

	else

		arm_smmu_attach_dev_blocked(&arm_smmu_blocked_domain, dev);



	arm_smmu_disable_pasid(master);

	arm_smmu_remove_master(master);

	if (arm_smmu_cdtab_allocated(&master->cd_table))
@@ -3678,6 +3672,7 @@ static int arm_smmu_def_domain_type(struct device *dev) 
static const struct iommu_ops arm_smmu_ops = {

	.identity_domain	= &arm_smmu_identity_domain,

	.blocked_domain		= &arm_smmu_blocked_domain,

	.release_domain		= &arm_smmu_blocked_domain,

	.capable		= arm_smmu_capable,

	.hw_info		= arm_smmu_hw_info,

	.domain_alloc_sva       = arm_smmu_sva_domain_alloc,