Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-18 18:44:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(spmd): prevent SIMD context loss" into integration

Browse source
This commit is contained in:
Manish Pandey 2025-02-18 12:59:04 +01:00 • committed by TrustedFirmware Code Review
commit dd9be1160a
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/std_svc/spmd/spmd_main.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved. * Copyright (c) 2020-2025, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -222,6 +222,7 @@ static uint64_t spmd_secure_interrupt_handler(uint32_t id,
* in this scenario where execution was trapped to EL3 due to FIQ. * in this scenario where execution was trapped to EL3 due to FIQ.
*/ */
simd_ctx_save(NON_SECURE, false); simd_ctx_save(NON_SECURE, false);
simd_ctx_restore(SECURE);
#endif #endif
#endif #endif
@ -238,14 +239,8 @@ static uint64_t spmd_secure_interrupt_handler(uint32_t id,
/* Mark current core as handling a secure interrupt. */ /* Mark current core as handling a secure interrupt. */
ctx->secure_interrupt_ongoing = true; ctx->secure_interrupt_ongoing = true;
#if CTX_INCLUDE_FPREGS || CTX_INCLUDE_SVE_REGS
simd_ctx_restore(SECURE);
#endif
rc = spmd_spm_core_sync_entry(ctx); rc = spmd_spm_core_sync_entry(ctx);
#if CTX_INCLUDE_FPREGS || CTX_INCLUDE_SVE_REGS
simd_ctx_save(SECURE, false);
#endif
if (rc != 0ULL) { if (rc != 0ULL) {
ERROR("%s failed (%" PRId64 ") on CPU%u\n", __func__, rc, plat_my_core_pos()); ERROR("%s failed (%" PRId64 ") on CPU%u\n", __func__, rc, plat_my_core_pos());
} }
@ -258,6 +253,7 @@ static uint64_t spmd_secure_interrupt_handler(uint32_t id,
cm_el1_sysregs_context_restore(NON_SECURE); cm_el1_sysregs_context_restore(NON_SECURE);
#if CTX_INCLUDE_FPREGS || CTX_INCLUDE_SVE_REGS #if CTX_INCLUDE_FPREGS || CTX_INCLUDE_SVE_REGS
simd_ctx_save(SECURE, false);
simd_ctx_restore(NON_SECURE); simd_ctx_restore(NON_SECURE);
#endif #endif
#endif #endif