commit 2cc6cee5f513188834dd8bac63fcdf4952ec0781
author AlexeiFedorov <Alexei.Fedorov@arm.com> Mon Oct 09 16:19:05 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Tue Oct 31 10:28:33 2023 +0000
tree e585389b10660efbe0d27ce55a93b89c9d1835df
parent 3776fa221628a9e016691e1228db686f3839207d

feat(rmm-eac5): update RMI/RSI_VERSION commands

This patch adds necessary support for RMI_VERSION
and RSI_VERSION commands.
Macro SMC_RSI_ABI_VERSION renamed to SMC_RSI_VERSION.

Note.
This patch sets both RSI and RMI version numbers to
1.0 as per RMM Specification 1.0-eac5.

Change-Id: Iaa35e71f8f38a58c068c6b0186e7b8108702d089
Signed-off-by: AlexeiFedorov <Alexei.Fedorov@arm.com>

runtime/core/handler.c

diff --git a/runtime/core/handler.c b/runtime/core/handler.c
index 29c73fc..1af375c 100644
--- a/runtime/core/handler.c
+++ b/runtime/core/handler.c
@@ -78,6 +78,7 @@
 	set_rmi_type(4, 0),	/* 4 arguments, 0 output values */
 	set_rmi_type(5, 0),	/* 5 arguments, 0 output values */
 	set_rmi_type(1, 1),	/* 1 argument,  1 output value */
+	set_rmi_type(1, 2),	/* 1 argument,  2 output values */
 	set_rmi_type(2, 2),	/* 2 arguments, 2 output values */
 	set_rmi_type(3, 1),	/* 3 arguments, 1 output value */
 	set_rmi_type(3, 2),	/* 3 arguments, 2 output values */
@@ -96,6 +97,7 @@
 		handler_4	f_40;
 		handler_5	f_50;
 		handler_1_o	f_11;
+		handler_1_o	f_12;
 		handler_2_o	f_22;
 		handler_3_o	f_31;
 		handler_3_o	f_32;
@@ -126,7 +128,7 @@
  * The 4th value enables the error log.
  */
 static const struct smc_handler smc_handlers[] = {
-	HANDLER(VERSION,		1, 1, smc_version,		 true,  true),
+	HANDLER(VERSION,		1, 2, smc_version,		 true,  true),
 	HANDLER(FEATURES,		1, 1, smc_read_feature_register, true,  true),
 	HANDLER(GRANULE_DELEGATE,	1, 0, smc_granule_delegate,	 false, true),
 	HANDLER(GRANULE_UNDELEGATE,	1, 0, smc_granule_undelegate,	 false, true),
@@ -306,6 +308,9 @@
 	case rmi_type_11:
 		handler->f_11(arg0, res);
 		break;
+	case rmi_type_12:
+		handler->f_12(arg0, res);
+		break;
 	case rmi_type_22:
 		handler->f_22(arg0, arg1, res);
 		break;