diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-04-26 11:56:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 11:56:40 +0100 |
| commit | 79199f702e54f2f30dc4726e657f319b14cf8ade (patch) | |
| tree | 70505899a3a655fb4f84d687264dcc75b1fcf79a | |
| parent | b7a52a786c523fbcc84756c45feba5f1dd59e500 (diff) | |
| parent | 7a317a70d4829feaeaf841584aff58162d13eb07 (diff) | |
| download | platform_external_arm-trusted-firmware-79199f702e54f2f30dc4726e657f319b14cf8ade.tar.gz platform_external_arm-trusted-firmware-79199f702e54f2f30dc4726e657f319b14cf8ade.tar.bz2 platform_external_arm-trusted-firmware-79199f702e54f2f30dc4726e657f319b14cf8ade.zip | |
Merge pull request #907 from antonio-nino-diaz-arm/an/smc-ret0
tspd:FWU:Fix usage of SMC_RET0
| -rw-r--r-- | bl1/bl1_fwu.c | 2 | ||||
| -rw-r--r-- | include/lib/smcc.h | 1 | ||||
| -rw-r--r-- | services/spd/tspd/tspd_main.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index f7fae6823..e2ede6817 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -109,7 +109,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid, break; } - SMC_RET0(handle); + SMC_RET1(handle, SMC_UNK); } /******************************************************************************* diff --git a/include/lib/smcc.h b/include/lib/smcc.h index 2f562c5dc..a4c4b6c0c 100644 --- a/include/lib/smcc.h +++ b/include/lib/smcc.h @@ -58,6 +58,7 @@ #define SMC_64 1 #define SMC_32 0 +#define SMC_OK 0 #define SMC_UNK 0xffffffff #define SMC_TYPE_FAST ULL(1) #define SMC_TYPE_STD 0 diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index ff515cca2..e5ec5cd22 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -631,7 +631,7 @@ uint64_t tspd_smc_handler(uint32_t smc_fid, cm_el1_sysregs_context_restore(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 |