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>
diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h
index db9815f..4e06bcd 100644
--- a/include/bl32/payloads/tlk.h
+++ b/include/bl32/payloads/tlk.h
@@ -12,18 +12,18 @@
/*
* Generate function IDs for the Trusted OS/Apps
*/
-#define TLK_TOS_STD_FID(fid) ((fid) | 0x72000000 | (0 << 31))
-#define TLK_TA_STD_FID(fid) ((fid) | 0x70000000 | (0 << 31))
+#define TLK_TOS_YIELD_FID(fid) ((fid) | 0x72000000 | (0 << 31))
+#define TLK_TA_YIELD_FID(fid) ((fid) | 0x70000000 | (0 << 31))
/*
* Trusted OS specific function IDs
*/
-#define TLK_REGISTER_LOGBUF TLK_TOS_STD_FID(0x1)
-#define TLK_REGISTER_REQBUF TLK_TOS_STD_FID(0x2)
-#define TLK_RESUME_FID TLK_TOS_STD_FID(0x100)
-#define TLK_SYSTEM_SUSPEND TLK_TOS_STD_FID(0xE001)
-#define TLK_SYSTEM_RESUME TLK_TOS_STD_FID(0xE002)
-#define TLK_SYSTEM_OFF TLK_TOS_STD_FID(0xE003)
+#define TLK_REGISTER_LOGBUF TLK_TOS_YIELD_FID(0x1)
+#define TLK_REGISTER_REQBUF TLK_TOS_YIELD_FID(0x2)
+#define TLK_RESUME_FID TLK_TOS_YIELD_FID(0x100)
+#define TLK_SYSTEM_SUSPEND TLK_TOS_YIELD_FID(0xE001)
+#define TLK_SYSTEM_RESUME TLK_TOS_YIELD_FID(0xE002)
+#define TLK_SYSTEM_OFF TLK_TOS_YIELD_FID(0xE003)
/*
* SMC function IDs that TLK uses to signal various forms of completions
@@ -40,10 +40,10 @@
/*
* Trusted Application specific function IDs
*/
-#define TLK_OPEN_TA_SESSION TLK_TA_STD_FID(0x1)
-#define TLK_CLOSE_TA_SESSION TLK_TA_STD_FID(0x2)
-#define TLK_TA_LAUNCH_OP TLK_TA_STD_FID(0x3)
-#define TLK_TA_SEND_EVENT TLK_TA_STD_FID(0x4)
+#define TLK_OPEN_TA_SESSION TLK_TA_YIELD_FID(0x1)
+#define TLK_CLOSE_TA_SESSION TLK_TA_YIELD_FID(0x2)
+#define TLK_TA_LAUNCH_OP TLK_TA_YIELD_FID(0x3)
+#define TLK_TA_SEND_EVENT TLK_TA_YIELD_FID(0x4)
/*
* Total number of function IDs implemented for services offered to NS clients.