From 472be0f74e8d4559471c6eb95169455001f236de Mon Sep 17 00:00:00 2001 From: Jeenu Viswambharan Date: Mon, 22 Jan 2018 12:42:54 +0000 Subject: [PATCH] TSPD: Register preempted SMC error code with EHF An earlier patch extended ehf_allow_ns_preemption() API to also register an error code to offer to Non-secure when a Yielding SMC is preempted by SDEI interrupt. In TSPD's case, register the error code TSP_PREEMPTED. Change-Id: I31992b6651f80694e83bc5092b044ef7a3eda690 Signed-off-by: Jeenu Viswambharan --- services/spd/tspd/tspd_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index c564f8b86..3d06e0b81 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -549,9 +549,10 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, * preempt Secure execution. However, for * yielding SMCs, we want preemption to happen; * so explicitly allow NS preemption in this - * case. + * case, and supply the preemption return code + * for TSP. */ - ehf_allow_ns_preemption(); + ehf_allow_ns_preemption(TSP_PREEMPTED); #endif } @@ -662,9 +663,10 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, #if EL3_EXCEPTION_HANDLING /* * Allow the resumed yielding SMC processing to be preempted by - * Non-secure interrupts. + * Non-secure interrupts. Also, supply the preemption return + * code for TSP. */ - ehf_allow_ns_preemption(); + ehf_allow_ns_preemption(TSP_PREEMPTED); #endif /* We just need to return to the preempted point in