feat(ff-a): update FF-A version to v1.1
Bump the required FF-A version in framework and manifests to v1.1 as
upstream feature development goes.
Change-Id: I1262c0a83a69ab2c333c89da2db8106b1c1fcb04
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/src/api.c b/src/api.c
index 41fadc7..8a90a27 100644
--- a/src/api.c
+++ b/src/api.c
@@ -442,17 +442,16 @@
*/
struct ffa_value api_ffa_spm_id_get(void)
{
- struct ffa_value ret = ffa_error(FFA_NOT_SUPPORTED);
-
- if (MAKE_FFA_VERSION(1, 1) <= FFA_VERSION_COMPILED) {
- /*
- * Return the SPMC ID that was fetched during FF-A
- * initialization.
- */
- ret = (struct ffa_value){.func = FFA_SUCCESS_32,
- .arg2 = arch_ffa_spmc_id_get()};
- }
- return ret;
+#if (MAKE_FFA_VERSION(1, 1) <= FFA_VERSION_COMPILED)
+ /*
+ * Return the SPMC ID that was fetched during FF-A
+ * initialization.
+ */
+ return (struct ffa_value){.func = FFA_SUCCESS_32,
+ .arg2 = arch_ffa_spmc_id_get()};
+#else
+ return ffa_error(FFA_NOT_SUPPORTED);
+#endif
}
/**
@@ -1788,12 +1787,11 @@
case FFA_MSG_SEND_DIRECT_RESP_32:
case FFA_MSG_SEND_DIRECT_REQ_64:
case FFA_MSG_SEND_DIRECT_REQ_32:
- return (struct ffa_value){.func = FFA_SUCCESS_32};
+#if (MAKE_FFA_VERSION(1, 1) <= FFA_VERSION_COMPILED)
/* FF-A v1.1 features. */
case FFA_SPM_ID_GET_32:
- if (MAKE_FFA_VERSION(1, 1) <= FFA_VERSION_COMPILED) {
- return (struct ffa_value){.func = FFA_SUCCESS_32};
- }
+#endif
+ return (struct ffa_value){.func = FFA_SUCCESS_32};
default:
return ffa_error(FFA_NOT_SUPPORTED);
}