commit 120d7d0b6573d0435b50b8b439677a49908dbe88
author AlexeiFedorov <Alexei.Fedorov@arm.com> Wed Aug 02 16:51:48 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Tue Oct 31 10:28:33 2023 +0000
tree 7dc198e23124a4246c010ec1d2328b53ded346b3
parent f777f4b76c687d5728ab271290b2b9b2e8bd25eb

feat(rmm-eac4): modify RMI_PSCI_COMPLETE command

This patch makes the following changes in
RMI_PSCI_COMPLETE command handler in according to
RMM Specification 1.0-eac3:
- added 'status' parameter passed in X3 register
- added 'status' failure condition.
PSCI and SMC return codes changed to comply with MISRA C
Rule 10.1 from UL(n) to (unsigned long)(n).

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

runtime/include/psci.h

diff --git a/runtime/include/psci.h b/runtime/include/psci.h
index b3b33da..426ab72 100644
--- a/runtime/include/psci.h
+++ b/runtime/include/psci.h
@@ -76,16 +76,16 @@
 #define SMC32_PSCI_MEM_PROTECT_CHECK_RANGE	SMC32_PSCI_FID(0x14U)
 #define SMC64_PSCI_MEM_PROTECT_CHECK_RANGE	SMC64_PSCI_FID(0x14U)
 
-#define PSCI_RETURN_SUCCESS		UL(0)
-#define PSCI_RETURN_NOT_SUPPORTED	UL(-1)
-#define PSCI_RETURN_INVALID_PARAMS	UL(-2)
-#define PSCI_RETURN_DENIED		UL(-3)
-#define PSCI_RETURN_ALREADY_ON		UL(-4)
-#define PSCI_RETURN_ON_PENDING		UL(-5)
-#define PSCI_RETURN_INTERNAL_FAILURE	UL(-6)
-#define PSCI_RETURN_NOT_PRESENT		UL(-7)
-#define PSCI_RETURN_DISABLED		UL(-8)
-#define PSCI_RETURN_INVALID_ADDRESS	UL(-9)
+#define PSCI_RETURN_SUCCESS		(unsigned long)(0)
+#define PSCI_RETURN_NOT_SUPPORTED	(unsigned long)(-1)
+#define PSCI_RETURN_INVALID_PARAMS	(unsigned long)(-2)
+#define PSCI_RETURN_DENIED		(unsigned long)(-3)
+#define PSCI_RETURN_ALREADY_ON		(unsigned long)(-4)
+#define PSCI_RETURN_ON_PENDING		(unsigned long)(-5)
+#define PSCI_RETURN_INTERNAL_FAILURE	(unsigned long)(-6)
+#define PSCI_RETURN_NOT_PRESENT		(unsigned long)(-7)
+#define PSCI_RETURN_DISABLED		(unsigned long)(-8)
+#define PSCI_RETURN_INVALID_ADDRESS	(unsigned long)(-9)
 
 #define PSCI_AFFINITY_INFO_ON		UL(0)
 #define PSCI_AFFINITY_INFO_OFF		UL(1)
@@ -98,6 +98,6 @@
 struct rec;
 
 unsigned long psci_complete_request(struct rec *calling_rec,
-				    struct rec *target_rec);
+				    struct rec *target_rec, unsigned long status);
 
 #endif /* PSCI_H */

runtime/include/smc-handler.h

diff --git a/runtime/include/smc-handler.h b/runtime/include/smc-handler.h
index 1d6a41a..685f3c5 100644
--- a/runtime/include/smc-handler.h
+++ b/runtime/include/smc-handler.h
@@ -81,7 +81,8 @@
 			struct smc_result *res);
 
 unsigned long smc_psci_complete(unsigned long calling_rec_addr,
-				unsigned long target_rec_addr);
+				unsigned long target_rec_addr,
+				unsigned long status);
 
 void smc_rtt_init_ripas(unsigned long rd_addr,
 			unsigned long base,