Skip to content

GitLab

Commit 79199f70 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #907 from antonio-nino-diaz-arm/an/smc-ret0 

tspd:FWU:Fix usage of SMC_RET0
parents b7a52a78 7a317a70
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
+3 -2
bl1/bl1_fwu.c
View file @ 79199f70
...@@ -109,7 +109,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid, ...@@ -109,7 +109,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid,
break; break;
} }
SMC_RET0(handle); SMC_RET1(handle, SMC_UNK);
} }
/******************************************************************************* /*******************************************************************************
......
include/lib/smcc.h
View file @ 79199f70
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#define SMC_64 1 #define SMC_64 1
#define SMC_32 0 #define SMC_32 0
#define SMC_OK 0
#define SMC_UNK 0xffffffff #define SMC_UNK 0xffffffff
#define SMC_TYPE_FAST ULL(1) #define SMC_TYPE_FAST ULL(1)
#define SMC_TYPE_STD 0 #define SMC_TYPE_STD 0
......
services/spd/tspd/tspd_main.c
View file @ 79199f70
...@@ -631,7 +631,7 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, ...@@ -631,7 +631,7 @@ uint64_t tspd_smc_handler(uint32_t smc_fid,
cm_el1_sysregs_context_restore(NON_SECURE); cm_el1_sysregs_context_restore(NON_SECURE);
cm_set_next_eret_context(NON_SECURE); cm_set_next_eret_context(NON_SECURE);
SMC_RET0(handle); SMC_RET1(handle, SMC_OK);
/* /*
* Request from non secure world to resume the preempted * Request from non secure world to resume the preempted
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment