commit 6f6bf2f90e71295e8c025e0d627e6cbd28d8b429
author Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Nov 12 14:43:23 2019 +0000
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Mon Jan 06 15:45:04 2020 +0000
tree 3d213459dea13e4c28fc097c0683e2fdee909b15
parent 6d37f2877ef27dcec1eb1d39e7f06b3e2386bcb8

dev-arm: Fix SMMUv3 16KB next-level table address masking

The next-level table address for a granule size of 16KB is retrieved
from the 47:14 bits of the current table descriptor (instead of
47:12, which is the valid masking for a 4KB granule)

Change-Id: I570138a34003dc034d8e67dc1209316157d57205
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Michiel van Tol <michiel.vantol@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23763
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/smmu_v3_ptops.cc

diff --git a/src/dev/arm/smmu_v3_ptops.cc b/src/dev/arm/smmu_v3_ptops.cc
index 96d876e..05c8bc0 100644
--- a/src/dev/arm/smmu_v3_ptops.cc
+++ b/src/dev/arm/smmu_v3_ptops.cc
@@ -273,7 +273,7 @@
             default: panic("bad level %d", level);
         }
     } else {
-        return mbits(pte, 47, 12);
+        return mbits(pte, 47, 14);
     }
 }