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

Merge pull request #110 from soby-mathew:sm/support_normal_irq_in_tsp-v4 into for-v0.4

Browse source
This commit is contained in:
Dan Handley 2014-05-27 18:46:22 +01:00
commit 05b6edfe26
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/spd/tspd/tspd_main.c
View file

@ -533,6 +533,7 @@ uint64_t tspd_smc_handler(uint32_t smc_fid,
*/ */
cm_el1_sysregs_context_restore(SECURE); cm_el1_sysregs_context_restore(SECURE);
cm_set_next_eret_context(SECURE); cm_set_next_eret_context(SECURE);
SMC_RET0(&tsp_ctx->cpu_ctx);
/* /*
* This is a request from the secure payload for more arguments * This is a request from the secure payload for more arguments
@ -544,10 +545,6 @@ uint64_t tspd_smc_handler(uint32_t smc_fid,
if (ns) if (ns)
SMC_RET1(handle, SMC_UNK); SMC_RET1(handle, SMC_UNK);
/* Get a reference to the non-secure context */
ns_cpu_context = cm_get_context(mpidr, NON_SECURE);
assert(ns_cpu_context);
get_tsp_args(tsp_ctx, x1, x2); get_tsp_args(tsp_ctx, x1, x2);
SMC_RET2(handle, x1, x2); SMC_RET2(handle, x1, x2);