evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: SMMU: clear page table ops of attached device

Browse source 
incase of error during dynamic attach,
added smmu attach device cleanup along with
free page table ops

Change-Id: Id8984d05002700014307a905fc7166702fa64a7d
Signed-off-by: vkakani <vkakani@codeaurora.org>
This commit is contained in:
vkakani 2018-05-29 15:41:04 +05:30 • committed by Gerrit - the friendly Code Review server
parent 7c542d932b
commit 528c99691b
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/iommu/arm-smmu.c
View file

@ -2256,8 +2256,17 @@ static int arm_smmu_attach_dynamic(struct iommu_domain *domain,
smmu_domain->pgtbl_ops = pgtbl_ops; smmu_domain->pgtbl_ops = pgtbl_ops;
ret = 0; ret = 0;
out: out:
if (ret) if (ret) {
free_io_pgtable_ops(pgtbl_ops); free_io_pgtable_ops(pgtbl_ops);
/* unassign any freed page table memory */
if (arm_smmu_is_master_side_secure(smmu_domain)) {
arm_smmu_secure_domain_lock(smmu_domain);
arm_smmu_secure_pool_destroy(smmu_domain);
arm_smmu_unassign_table(smmu_domain);
arm_smmu_secure_domain_unlock(smmu_domain);
}
smmu_domain->pgtbl_ops = NULL;
}
mutex_unlock(&smmu->attach_lock); mutex_unlock(&smmu->attach_lock);
return ret; return ret;