| commit | 1479ad9ef05d7ac6443c3aa03f5e02fa88179ab4 | [log] [tgz] |
|---|---|---|
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | Wed Mar 03 11:38:06 2021 +0000 |
| committer | Bobby R. Bruce <bbruce@ucdavis.edu> | Wed Mar 17 19:58:48 2021 +0000 |
| tree | 0cf74d0c1381b3bd59d2156257bf6694ee494f0d | |
| parent | 9ea38f7147c9516976878318e08fcd77d7798aac [diff] |
arch-arm: Fix atomics permission checks in TLB For stage 2 translations, atomic accesses were not checking the access permission bits in the page table descriptors, and were instead wrongly using the nature of the request itself (r/w booleans). Cherry-picked from: https://gem5-review.googlesource.com/c/public/gem5/+/42073 Change-Id: I919a08b690287b03426d9124a61887e521f47823 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43143 Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc index 413a13e..a09c953 100644 --- a/src/arch/arm/tlb.cc +++ b/src/arch/arm/tlb.cc
@@ -772,8 +772,7 @@ // sctlr.wxn overrides the xn bit grant = !wxn && !xn; } else if (is_atomic) { - grant = r && w; - grant_read = r; + grant = hap; } else if (is_write) { grant = hap & 0x2; } else { // is_read