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

Commit c154f0af authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Check for static-cb option before requesting TZ"

parents 4bb173d3 efba7077

drivers/iommu/arm-smmu.c

+2 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,8 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, 
		/* CBA2R */

#ifdef CONFIG_64BIT

		reg = CBA2R_RW64_64BIT;

		if (!arm_smmu_has_secure_vmid(smmu_domain))

		if (!arm_smmu_has_secure_vmid(smmu_domain) &&

			arm_smmu_is_static_cb(smmu))

			msm_tz_set_cb_format(smmu->sec_id, cfg->cbndx);

#else

		reg = CBA2R_RW64_32BIT;