From 2d6a28e2e3a2c97f36060da27c6b09bdae0d6da1 Mon Sep 17 00:00:00 2001 From: Susheel Khiani Date: Mon, 22 Feb 2016 10:46:46 +0530 Subject: [PATCH] iommu/arm-smmu: Check for static-cb option before requesting TZ We want to request TZ to change page table format for non secure context banks only if static-cb option is enabled. If the option is disabled then programming of global registers would be done by HLOS itself and we need not request TZ to change page table format. Change-Id: Id2228e6d2ec835e169d679296760256ce0524050 Signed-off-by: Susheel Khiani --- drivers/iommu/arm-smmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 6b4f7605b7e0..761381389907 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1384,7 +1384,8 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, */ #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;