From f36e62e3c77fc3af065b39df919094ec27326d69 Mon Sep 17 00:00:00 2001 From: Max Shvetsov Date: Thu, 18 Feb 2021 16:45:08 +0000 Subject: [PATCH] Revert "spmd: ensure SIMD context is saved/restored on SPMC entry/exit" This reverts commit bedb13f509ac68adaf9baa9b5f24eede912e801d. SIMD context is now saved in S-EL2 as opposed to EL3, see commit: https://review.trustedfirmware.org/c/hafnium/hafnium/+/8321 Signed-off-by: Max Shvetsov Change-Id: Ic81416464ffada1a6348d0abdcf3adc7c1879e61 --- services/std_svc/spmd/spmd_main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index a076be255..6aab5588b 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -109,7 +109,6 @@ uint64_t spmd_spm_core_sync_entry(spmd_spm_core_context_t *spmc_ctx) /* Restore the context assigned above */ cm_el1_sysregs_context_restore(SECURE); - #if SPMD_SPM_AT_SEL2 cm_el2_sysregs_context_restore(SECURE); #endif @@ -349,18 +348,12 @@ static uint64_t spmd_smc_forward(uint32_t smc_fid, /* 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