arch-arm: Fix XN in TLB permissions
authorGiacomo Travaglini <giacomo.travaglini@arm.com>
Tue, 11 Aug 2020 08:37:04 +0000 (09:37 +0100)
committerGiacomo Travaglini <giacomo.travaglini@arm.com>
Fri, 14 Aug 2020 13:07:41 +0000 (13:07 +0000)
commit735cf323b513cc9e99452e0c7a231df6d37fb26a
tree0b7dd02b09096a8bfdfd1aa7d96e5c2228e034de
parent31d118ffccd9935ec75075c83e84faa7246e22fe
arch-arm: Fix XN in TLB permissions

The SIF condition check should be logically ORed with the TLB
entry XN attribute, instead of overriding it.

Change-Id: I70b38d97bbdc82b9f385d40ad06546785fc2c5bb
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32635
Tested-by: kokoro <noreply+kokoro@google.com>
src/arch/arm/tlb.cc