diff options
| author | David Cunado <david.cunado@arm.com> | 2017-04-16 17:15:08 +0100 |
|---|---|---|
| committer | David Cunado <david.cunado@arm.com> | 2017-05-04 21:23:06 +0100 |
| commit | bbbbcdaecf941d57f5d4ca4332a9551a27a69b3c (patch) | |
| tree | 340dc2cd12a4f25a108969f697c70cda54b871da /services/spd/trusty/trusty.c | |
| parent | f132b4a05b23916c1101add4bd6d973a99983719 (diff) | |
Migrate secure payload dispatchers to new SMC terminology
Since Issue B (November 2016) of the SMC Calling Convention document
standard SMC calls are renamed to yielding SMC calls to help avoid
confusion with the standard service SMC range, which remains unchanged.
http://infocenter.arm.com/help/topic/com.arm.doc.den0028b/ARM_DEN0028B_SMC_Calling_Convention.pd
A previous patch introduced a new define for yielding SMC call type.
This patch updates the secure payload dispatchers (except the TSPD) to
use this new define and also migrates the code to use the new
terminology.
Change-Id: I3d2437c04e3b21fdbd32019f55c066c87679a5bf
Signed-off-by: David Cunado <david.cunado@arm.com>
Diffstat (limited to 'services/spd/trusty/trusty.c')
| -rw-r--r-- | services/spd/trusty/trusty.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index 1968ac45..a95141bf 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -221,14 +221,14 @@ static uint64_t trusty_smc_handler(uint32_t smc_fid, * Verified Boot is not even supported and returning success here * would not compromise the boot process. */ - if (!ep_info && (smc_fid == SMC_SC_SET_ROT_PARAMS)) { + if (!ep_info && (smc_fid == SMC_YC_SET_ROT_PARAMS)) { SMC_RET1(handle, 0); } else if (!ep_info) { SMC_RET1(handle, SMC_UNK); } if (is_caller_secure(flags)) { - if (smc_fid == SMC_SC_NS_RETURN) { + if (smc_fid == SMC_YC_NS_RETURN) { ret = trusty_context_switch(SECURE, x1, 0, 0, 0); SMC_RET8(handle, ret.r0, ret.r1, ret.r2, ret.r3, ret.r4, ret.r5, ret.r6, ret.r7); @@ -424,13 +424,13 @@ DECLARE_RT_SVC( trusty_smc_handler ); -/* Define a SPD runtime service descriptor for standard SMC calls */ +/* Define a SPD runtime service descriptor for yielding SMC calls */ DECLARE_RT_SVC( trusty_std, OEN_TAP_START, SMC_ENTITY_SECURE_MONITOR, - SMC_TYPE_STD, + SMC_TYPE_YIELD, NULL, trusty_smc_handler ); |