commit 93fadbcabef27580bcfd2647d1f66f5f5c31b7d3
author Giacomo Travaglini <giacomo.travaglini@arm.com> Wed Jun 26 11:50:24 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Jul 16 13:17:04 2019 +0000
tree 11eb2355c9ed5236b92cd4b8b829a89a806fa4f9
parent 34e77161fb42847797338ffe95674f248798ab43

dev-arm: Fix SMMUv3 ContextDescriptor pointer shift

The context descriptor pointer in the STE starts at the sixth LSB

Change-Id: Ifa346b350785b788e9d1e093b662cb26433adfb8
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Christo Smallwood <christo.smallwood@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19469
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/smmu_v3_defs.hh

diff --git a/src/dev/arm/smmu_v3_defs.hh b/src/dev/arm/smmu_v3_defs.hh
index 2070e1d..991e90c 100644
--- a/src/dev/arm/smmu_v3_defs.hh
+++ b/src/dev/arm/smmu_v3_defs.hh
@@ -67,7 +67,7 @@
 
 enum {
     ST_CFG_SPLIT_SHIFT = 6,
-    ST_CD_ADDR_SHIFT   = 5,
+    ST_CD_ADDR_SHIFT   = 6,
     CD_TTB_SHIFT       = 4,
     STE_S2TTB_SHIFT    = 4,
 };