commit 807dda8e594b6983c70d85f715cdd9a7f9f2c725
author Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Fri May 03 14:22:43 2024 +0100
committer Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Tue Jul 09 11:01:19 2024 +0100
tree c2f628e4ee1345eeb0930adfd97fe67d4cdfe20a
parent 411a621afb1a4a2a8e2a79f25bba386c96c42af2

refactor(lib/smc): rename RMI calls prefix from SMC_RMM to SMC_RMI

Rename SMC_RMM_<command> to SMC_RMI_<command>. This aligns with the
naming convention used in RMM specification. Prefix SMC_RMM_ is used
for EL3 to RMM interface SMC calls.

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: Id99dc9dd41b4280fe34f59740c7a92e015f89788

runtime/core/handler.c

diff --git a/runtime/core/handler.c b/runtime/core/handler.c
index 203af89..7d306d0 100644
--- a/runtime/core/handler.c
+++ b/runtime/core/handler.c
@@ -117,7 +117,7 @@
  */
 #define RMI_HANDLER_ID(_id)	SMC64_FID_OFFSET_FROM_RANGE_MIN(RMI, _id)
 
-#define HANDLER(_id, _in, _out, _fn, _exec, _error)[RMI_HANDLER_ID(SMC_RMM_##_id)] = { \
+#define HANDLER(_id, _in, _out, _fn, _exec, _error)[RMI_HANDLER_ID(SMC_RMI_##_id)] = { \
 	.fn_name = (#_id),				\
 	.type = (enum rmi_type)RMI_TYPE(_in, _out),	\
 	.f_##_in##_out = (_fn),				\
@@ -160,8 +160,8 @@
 static inline bool rmi_handler_needs_fpu(unsigned int id)
 {
 #ifdef RMM_FPU_USE_AT_REL2
-	if ((id == SMC_RMM_REALM_CREATE) || (id == SMC_RMM_DATA_CREATE) ||
-	    (id == SMC_RMM_REC_CREATE) || (id == SMC_RMM_RTT_INIT_RIPAS)) {
+	if ((id == SMC_RMI_REALM_CREATE) || (id == SMC_RMI_DATA_CREATE) ||
+	    (id == SMC_RMI_REC_CREATE) || (id == SMC_RMI_RTT_INIT_RIPAS)) {
 		return true;
 	}
 #else
@@ -189,7 +189,7 @@
 		unsigned int num;
 
 		/* Print function name */
-		INFO("SMC_RMM_%-21s", handler->fn_name);
+		INFO("SMC_RMI_%-21s", handler->fn_name);
 
 		/* Print arguments */
 		num = (unsigned int)handler->type & 0xFFU;
@@ -207,7 +207,7 @@
 		}
 
 		/* Check for index */
-		if (((function_id == SMC_RMM_REC_ENTER) &&
+		if (((function_id == SMC_RMI_REC_ENTER) &&
 		     (rc.status == RMI_ERROR_REALM)) ||
 		     (rc.status == RMI_ERROR_RTT)) {
 			INFO(" %x", rc.index);
@@ -215,8 +215,8 @@
 
 		if ((rc.status == RMI_SUCCESS) ||
 		   ((rc.status == RMI_ERROR_RTT) &&
-		   ((function_id == SMC_RMM_RTT_DESTROY) ||
-		    (function_id == SMC_RMM_DATA_DESTROY)))) {
+		   ((function_id == SMC_RMI_RTT_DESTROY) ||
+		    (function_id == SMC_RMI_DATA_DESTROY)))) {
 			/* Print output values */
 			num = ((unsigned int)handler->type >> 8) & 0xFFU;
 			assert(num <= MAX_NUM_OUTPUT_VALS);