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

feat(el3_spmc): ffa error handling in direct msg

Browse source 
When an FFA_ERROR happens while handling a direct message
from normal world, return to normal world with
FFA_ERROR. Otherwise, the system would re-enter the secure partition
with FFA_ERROR.

Change-Id: I3d9a68a41b4815c1a8e10354cfcf68fec9f4b800
Signed-off-by: Levi Yun <yeoreum.yun@arm.com>
This commit is contained in:
Levi Yun 2024-11-13 08:35:47 +00:00 • committed by Yeoreum Yun
parent 09a580b796
commit e1168bc375
1 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
services/std_svc/spm/el3_spmc/spmc_main.c
View file

@ -696,6 +696,8 @@ static uint64_t ffa_error_handler(uint32_t smc_fid,
{ {
struct secure_partition_desc *sp; struct secure_partition_desc *sp;
unsigned int idx; unsigned int idx;
uint16_t dst_id = ffa_endpoint_destination(x1);
bool cancel_dir_req = false;
/* Check that the response did not originate from the Normal world. */ /* Check that the response did not originate from the Normal world. */
if (!secure_origin) { if (!secure_origin) {
@ -723,6 +725,32 @@ static uint64_t ffa_error_handler(uint32_t smc_fid,
panic(); panic();
} }
if (sp->runtime_el == S_EL0) {
spin_lock(&sp->rt_state_lock);
}
if (sp->ec[idx].rt_state == RT_STATE_RUNNING &&
sp->ec[idx].rt_model == RT_MODEL_DIR_REQ) {
sp->ec[idx].rt_state = RT_STATE_WAITING;
sp->ec[idx].dir_req_origin_id = INV_SP_ID;
sp->ec[idx].dir_req_funcid = 0x00;
cancel_dir_req = true;
}
if (sp->runtime_el == S_EL0) {
spin_unlock(&sp->rt_state_lock);
}
if (cancel_dir_req) {
if (dst_id == FFA_SPMC_ID) {
spmc_sp_synchronous_exit(&sp->ec[idx], x4);
/* Should not get here. */
panic();
} else
return spmc_smc_return(smc_fid, secure_origin, x1, x2, x3, x4,
handle, cookie, flags, dst_id);
}
return spmc_ffa_error_return(handle, FFA_ERROR_NOT_SUPPORTED); return spmc_ffa_error_return(handle, FFA_ERROR_NOT_SUPPORTED);
} }