From: Marc Mari Barcelo <marc.maribarcelo@arm.com>
Date: Wed, 18 Sep 2019 17:10:42 +0000 (+0100)
Subject: dev-arm: Fix address used to update the SMMUv3 Walk Cache
X-Git-Tag: v19.0.0.0~484
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee4648fa7ef160c4c4decf4e3f4b53589e514591;p=gem5.git

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>
---

diff --git a/src/dev/arm/smmu_v3_transl.cc b/src/dev/arm/smmu_v3_transl.cc
index 429cc2b44..b28682686 100644
--- a/src/dev/arm/smmu_v3_transl.cc
+++ b/src/dev/arm/smmu_v3_transl.cc
@@ -803,7 +803,7 @@ SMMUTranslationProcess::walkStage1And2(Yield &yield, Addr addr,
         tr = combineTranslations(tr, s2tr);
     }
 
-    walkCacheUpdate(yield, addr, tr.addrMask, tr.addr,
+    walkCacheUpdate(yield, addr, tr.addrMask, walkPtr,
                     1, level, true, tr.writable);
 
     return tr;