1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 93b9177d4dfd..d01802e7cbfd 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -264,6 +264,7 @@ enum arm_smmu_s2cr_privcfg {
 
 #define TTBCR2_SEP_SHIFT                15
 #define TTBCR2_SEP_UPSTREAM             (0x7 << TTBCR2_SEP_SHIFT)
+#define TTBCR2_AS                       (1 << 4)
 
 #define TTBRn_ASID_SHIFT                48
 
@@ -783,6 +784,8 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain,
                         reg = pgtbl_cfg->arm_lpae_s1_cfg.tcr;
                         reg2 = pgtbl_cfg->arm_lpae_s1_cfg.tcr >> 32;
                         reg2 |= TTBCR2_SEP_UPSTREAM;
+                        if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH64)
+                                reg2 |= TTBCR2_AS;
                 }
                 if (smmu->version > ARM_SMMU_V1)
                         writel_relaxed(reg2, cb_base + ARM_SMMU_CB_TTBCR2);