From: Jan Kiszka <[email protected]>

TTBCR is SMMUv1 terminology. We are v2-only.

Signed-off-by: Jan Kiszka <[email protected]>
---
 hypervisor/arch/arm64/smmu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hypervisor/arch/arm64/smmu.c b/hypervisor/arch/arm64/smmu.c
index da904d1d..e255e381 100644
--- a/hypervisor/arch/arm64/smmu.c
+++ b/hypervisor/arch/arm64/smmu.c
@@ -101,8 +101,7 @@
 #define ARM_SMMU_CB_SCTLR              0x0
 #define ARM_SMMU_CB_ACTLR              0x4
 #define ARM_SMMU_CB_TTBR0              0x20
-#define ARM_SMMU_CB_TTBCR              0x30
-#define ARM_SMMU_CB_CONTEXTIDR         0x34
+#define ARM_SMMU_CB_TCR                        0x30
 #define ARM_SMMU_CB_FSR                        0x58
 
 #define SCTLR_CFIE                     (1 << 6)
@@ -259,11 +258,11 @@ static void arm_smmu_write_context_bank(struct 
arm_smmu_device *smmu, int idx)
        mmio_write32(gr1_base + ARM_SMMU_GR1_CBAR(idx), reg);
 
        /*
-        * TTBCR
+        * TCR
         * We must write this before the TTBRs, since it determines the
         * access behaviour of some fields (in particular, ASID[15:8]).
         */
-       mmio_write32(cb_base + ARM_SMMU_CB_TTBCR, cb->tcr[0]);
+       mmio_write32(cb_base + ARM_SMMU_CB_TCR, cb->tcr[0]);
 
        /* TTBRs */
        mmio_write64(cb_base + ARM_SMMU_CB_TTBR0, cb->ttbr);
-- 
2.26.2

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jailhouse-dev/ea9386c2f2f4a47ae24056af01eabda483433297.1602664150.git.jan.kiszka%40siemens.com.

Reply via email to