Merge "iommu/arm-smmu: avoid possible deadlock during map_sg"

This commit is contained in:
qctecmdr 2020-01-08 20:10:12 -08:00 • committed by Gerrit - the friendly Code Review server
commit 7c46c88c7b

View file

@ -3046,12 +3046,12 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova,
out:
arm_smmu_assign_table(smmu_domain);
arm_smmu_secure_domain_unlock(smmu_domain);
if (size_to_unmap) {
arm_smmu_unmap(domain, __saved_iova_start, size_to_unmap, NULL);
iova = __saved_iova_start;
}
arm_smmu_secure_domain_unlock(smmu_domain);
return iova - __saved_iova_start;
}