Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d5744d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: arm-smmu: Remove unnecessary power_on call"

parents a9823b57 cab6a692

drivers/iommu/arm-smmu.c

+0 −5
Original line number Diff line number Diff line
@@ -2706,10 +2706,6 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova, 
	if (arm_smmu_is_slave_side_secure(smmu_domain))

		return msm_secure_smmu_map_sg(domain, iova, sg, nents, prot);



	ret = arm_smmu_domain_power_on(domain, smmu_domain->smmu);

	if (ret)

		return ret;



	arm_smmu_prealloc_memory_sg(smmu_domain, sg, nents, &nonsecure_pool);

	arm_smmu_secure_domain_lock(smmu_domain);
@@ -2754,7 +2750,6 @@ static size_t arm_smmu_map_sg(struct iommu_domain *domain, unsigned long iova, 
		iova = __saved_iova_start;

	}

	arm_smmu_secure_domain_unlock(smmu_domain);

	arm_smmu_domain_power_off(domain, smmu_domain->smmu);

	arm_smmu_release_prealloc_memory(smmu_domain, &nonsecure_pool);

	return iova - __saved_iova_start;

}