diff options
| author | Susheel Khiani <skhiani@codeaurora.org> | 2016-02-22 10:46:46 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:25:39 -0700 |
| commit | 2d6a28e2e3a2c97f36060da27c6b09bdae0d6da1 (patch) | |
| tree | 042787dd55c8b9677e601398f67bbdd051960ede /drivers/iommu/arm-smmu.c | |
| parent | 20a5dc1e2f1fd77842eccfe7ec533a6f203b4919 (diff) | |
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 <skhiani@codeaurora.org>
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |