Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/58118 )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch-arm: _NS used in AArch32 if EL3 is AArch64
......................................................................
arch-arm: _NS used in AArch32 if EL3 is AArch64
This is extending the behaviour of a previous patch [1] to EL0,
as CNTP is user (EL0) accessible
[1]: https://gem5-review.googlesource.com/9941
Change-Id: I54b493f32209ea53674e9025bbaba65e8134961e
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/58118
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/regs/misc.cc
1 file changed, 27 insertions(+), 2 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc
index d1d8756..00d5501 100644
--- a/src/arch/arm/regs/misc.cc
+++ b/src/arch/arm/regs/misc.cc
@@ -2258,6 +2258,8 @@
.bankedChild()
.nonSecure()
.privSecure(!aarch32EL3)
+ .userSecureRead(!aarch32EL3)
+ .userSecureWrite(!aarch32EL3)
.res0(0xfffffff8);
InitReg(MISCREG_CNTP_CTL_S)
.bankedChild()
@@ -2269,7 +2271,9 @@
InitReg(MISCREG_CNTP_CVAL_NS)
.bankedChild()
.nonSecure()
- .privSecure(!aarch32EL3);
+ .privSecure(!aarch32EL3)
+ .userSecureRead(!aarch32EL3)
+ .userSecureWrite(!aarch32EL3);
InitReg(MISCREG_CNTP_CVAL_S)
.bankedChild()
.secure()
@@ -2279,7 +2283,9 @@
InitReg(MISCREG_CNTP_TVAL_NS)
.bankedChild()
.nonSecure()
- .privSecure(!aarch32EL3);
+ .privSecure(!aarch32EL3)
+ .userSecureRead(!aarch32EL3)
+ .userSecureWrite(!aarch32EL3);
InitReg(MISCREG_CNTP_TVAL_S)
.bankedChild()
.secure()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58118
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: I54b493f32209ea53674e9025bbaba65e8134961e
Gerrit-Change-Number: 58118
Gerrit-PatchSet: 5
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
