diff options
| author | Olivier Deprez <olivier.deprez@arm.com> | 2021-02-12 17:48:21 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-02-12 17:48:21 +0000 |
| commit | 66306814586b1bf6bcb859aaad218ec3bb090e94 (patch) | |
| tree | cfe221ba083b33a8fc5982770d409c3581b2058f | |
| parent | 305135716a25d07235aec231cb7d285503884dea (diff) | |
| parent | bedb13f509ac68adaf9baa9b5f24eede912e801d (diff) | |
| download | arm-trusted-firmware-66306814586b1bf6bcb859aaad218ec3bb090e94.tar.gz | |
Merge "spmd: ensure SIMD context is saved/restored on SPMC entry/exit" into integration
| -rw-r--r-- | services/std_svc/spmd/spmd_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/std_svc/spmd/spmd_main.c b/services/std_svc/spmd/spmd_main.c index 6aab5588b..a076be255 100644 --- a/services/std_svc/spmd/spmd_main.c +++ b/services/std_svc/spmd/spmd_main.c @@ -109,6 +109,7 @@ 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 @@ -348,12 +349,18 @@ 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 |