commit e4fe2969828546df15c80a9668454633072d53a5
author Kathleen Capella <kathleen.capella@arm.com> Fri Sep 01 17:08:47 2023 -0400
committer Madhukar Pappireddy <madhukar.pappireddy@arm.com> Fri Dec 01 16:17:13 2023 +0100
tree d4dfdc03d793ee548e4fb8888c40cec591b26317
parent ad7451b1faee3df30ed4d5472d30752328061f93

feat(ff-a): update FF-A version to v1.2

Bump the required FF-A version in framework and manifests to v1.2 as
upstream feature development goes.

Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
Change-Id: Ic8b1822fc32a081350cc1e6123d33c0542dc237d

src/api.c

diff --git a/src/api.c b/src/api.c
index 843b8dc..695eef5 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2456,7 +2456,13 @@
 	case FFA_MEM_PERM_GET_64:
 	case FFA_MEM_PERM_SET_64:
 	case FFA_MSG_SEND2_32:
+#endif
+#if (MAKE_FFA_VERSION(1, 2) <= FFA_VERSION_COMPILED)
+	/* FF-A v1.2 features. */
+	case FFA_CONSOLE_LOG_32:
+	case FFA_CONSOLE_LOG_64:
 	case FFA_PARTITION_INFO_GET_REGS_64:
+	case FFA_EL3_INTR_HANDLE_32:
 #endif
 		return (struct ffa_value){.func = FFA_SUCCESS_32};
 	case FFA_MEM_RETRIEVE_REQ_32:
@@ -2954,7 +2960,7 @@
 
 	*out_v1_1 = (struct ffa_memory_region *)allocated;
 
-	if (ffa_version == MAKE_FFA_VERSION(1, 1)) {
+	if (ffa_version >= MAKE_FFA_VERSION(1, 1)) {
 		return (struct ffa_value){.func = FFA_SUCCESS_32};
 	}
 
@@ -3292,7 +3298,7 @@
 	assert(fragment_length != NULL);
 	assert(retrieve_msg != NULL);
 
-	if (ffa_version == MAKE_FFA_VERSION(1, 1)) {
+	if (ffa_version >= MAKE_FFA_VERSION(1, 1)) {
 		*out_v1_1 = (struct ffa_memory_region *)retrieve_msg;
 		return (struct ffa_value){.func = FFA_SUCCESS_32};
 	}