commit ee4648fa7ef160c4c4decf4e3f4b53589e514591
author Marc Mari Barcelo <marc.maribarcelo@arm.com> Wed Sep 18 18:10:42 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Wed Oct 02 15:55:06 2019 +0000
tree 6b7aba19ca10d20a62802fb5f051cb32f79aa665
parent a25954a9d96f97f288a8701b3048a470773102ee

dev-arm: Fix address used to update the SMMUv3 Walk Cache

Last level of SMMUv3 WalkCache should store the address without an offset.

Change-Id: I1046bd8210500c2c38802acd41a4403e52fd3c90
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21302
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/smmu_v3_transl.cc

diff --git a/src/dev/arm/smmu_v3_transl.cc b/src/dev/arm/smmu_v3_transl.cc
index 429cc2b..b286826 100644
--- a/src/dev/arm/smmu_v3_transl.cc
+++ b/src/dev/arm/smmu_v3_transl.cc
@@ -803,7 +803,7 @@
         tr = combineTranslations(tr, s2tr);
     }
 
-    walkCacheUpdate(yield, addr, tr.addrMask, tr.addr,
+    walkCacheUpdate(yield, addr, tr.addrMask, walkPtr,
                     1, level, true, tr.writable);
 
     return tr;