diff options
| author | Boyan Karatotev <boyan.karatotev@arm.com> | 2023-02-13 16:32:47 +0000 |
|---|---|---|
| committer | Jayanth Dodderi Chidanand <jayanthdodderi.chidanand@arm.com> | 2023-07-24 11:04:44 +0100 |
| commit | ece8f7d7347db517e141897b8bcb5e696fba97f9 (patch) | |
| tree | 2a0aa42c2c688a6d0c5d0ce4a76e2d83194033e4 /lib/el3_runtime | |
| parent | 99506face112410ae37cf617b6efa809b4eee0ee (diff) | |
refactor(cm): set MDCR_EL3/CPTR_EL3 bits in respective feat_init_el3() only
These bits (MDCR_EL3.{NSTB, NSTBE, TTRF, TPM}, CPTR_EL3.TTA) only affect
EL2 (and lower) execution. Each feat_init_el3() is called long before
any lower EL has had a chance to execute, so setting the bits at reset
is redundant. Removing them from reset code also improves readability of
the immutable EL3 state.
Preserve the original intention for the TTA bit of "enabled for NS and
disabled everywhere else" (inferred from commit messages d4582d3088 and
2031d6166a and the comment). This is because CPTR_EL3 will be contexted
and so everyone will eventually get whatever NS has anyway.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I3d24b45d3ea80882c8e450b2d9db9d5531facec1
Diffstat (limited to 'lib/el3_runtime')
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 8fd9f751e..9d717bb4e 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -662,6 +662,11 @@ static void manage_extensions_secure(cpu_context_t *ctx) sme_disable(ctx); } } + + /* NS can access this but Secure shouldn't */ + if (is_feat_sys_reg_trace_supported()) { + sys_reg_trace_disable(ctx); + } #endif /* IMAGE_BL31 */ } |