commit d734f71f1a5ec811844f1d74265fb4281bd5082e
author Olivier Deprez <olivier.deprez@arm.com> Tue Dec 01 15:33:59 2020 +0100
committer Max Shvetsov <maksims.svecovs@arm.com> Fri Feb 12 10:54:08 2021 +0000
tree a15d05dca6a07c5d2b9f1c39a8cdeaeb79fb202e
parent 65ecb40fb891c06c7ad45a5cfbc39e6caa3cede3

spmd: ensure SIMD context is saved/restored on SPMC entry/exit

Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I8ed58ec5f97e05d91451020a2739464bb8e428b3

services/std_svc/spmd/spmd_main.c

diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c
index 6aab558..a076be2 100644
--- a/services/std_svc/spmd/spmd_main.c
+++ b/services/std_svc/spmd/spmd_main.c
@@ -109,6 +109,7 @@
 
 	/* Restore the context assigned above */
 	cm_el1_sysregs_context_restore(SECURE);
+
 #if SPMD_SPM_AT_SEL2
 	cm_el2_sysregs_context_restore(SECURE);
 #endif
@@ -348,12 +349,18 @@
 
 	/* Save incoming security state */
 	cm_el1_sysregs_context_save(secure_state_in);
+#if CTX_INCLUDE_FPREGS
+	fpregs_context_save(get_fpregs_ctx(cm_get_context(secure_state_in)));
+#endif
 #if SPMD_SPM_AT_SEL2
 	cm_el2_sysregs_context_save(secure_state_in);
 #endif
 
 	/* Restore outgoing security state */
 	cm_el1_sysregs_context_restore(secure_state_out);
+#if CTX_INCLUDE_FPREGS
+	fpregs_context_restore(get_fpregs_ctx(cm_get_context(secure_state_out)));
+#endif
 #if SPMD_SPM_AT_SEL2
 	cm_el2_sysregs_context_restore(secure_state_out);
 #endif