Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/32635 )
Change subject: arch-arm: Fix XN in TLB permissions
......................................................................
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.travagl...@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32635
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/tlb.cc
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index f67475b..4d54b54 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -833,7 +833,8 @@
bool w = is_write;
bool x = is_fetch;
- xn = ArmSystem::haveEL(tc, EL3) && isSecure && te->ns && scr.sif;
+ if (ArmSystem::haveEL(tc, EL3) && isSecure && te->ns && scr.sif)
+ xn = true;
// grant_read is used for faults from an atomic instruction that
// both reads and writes from a memory location. From a ISS point
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/32635
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I70b38d97bbdc82b9f385d40ad06546785fc2c5bb
Gerrit-Change-Number: 32635
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
