diff options
| author | Artsem Artsemenka <artsem.artsemenka@arm.com> | 2019-11-26 16:40:31 +0000 |
|---|---|---|
| committer | Artsem Artsemenka <artsem.artsemenka@arm.com> | 2019-12-06 17:42:45 +0000 |
| commit | db3ae8538b8a2cc89e2211201ec96df72e597ae0 (patch) | |
| tree | fec6243e7c813c65384a5b6eab77239211cba149 /lib | |
| parent | 0376e7c4aa2ce9ae94d72555cea27cd7aff8e32a (diff) | |
| download | platform_external_arm-trusted-firmware-db3ae8538b8a2cc89e2211201ec96df72e597ae0.tar.gz platform_external_arm-trusted-firmware-db3ae8538b8a2cc89e2211201ec96df72e597ae0.tar.bz2 platform_external_arm-trusted-firmware-db3ae8538b8a2cc89e2211201ec96df72e597ae0.zip | |
S-EL2 Support: Check for AArch64
Check that entry point information requesting S-EL2
has AArch64 as an execution state during context setup.
Signed-off-by: Artsem Artsemenka <artsem.artsemenka@arm.com>
Change-Id: I447263692fed6e55c1b076913e6eb73b1ea735b7
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 752a2606e..b7908adec 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -182,8 +182,14 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep) } /* Enable S-EL2 if the next EL is EL2 and security state is secure */ - if ((security_state == SECURE) && (GET_EL(ep->spsr) == MODE_EL2)) + if ((security_state == SECURE) && (GET_EL(ep->spsr) == MODE_EL2)) { + if (GET_RW(ep->spsr) != MODE_RW_64) { + ERROR("S-EL2 can not be used in AArch32."); + panic(); + } + scr_el3 |= SCR_EEL2_BIT; + } /* * Initialise SCTLR_EL1 to the reset value corresponding to the target |