fix(ff-a): plat_ffa module build failures
The patch corrects the following issues with plat_ffa module:
- The header "ffa.h" from plat_ffa module was not being included in the
source files that implement it (spmc.c, hypervisor.c and ffa.c).
This was letting some functions to link with mis-aligned signatures from
the header and source file.
- The toolchain "android_aarch64" missed plat_ffa module. This patch
includes the hash for the submodule "project/reference" that is fixing
this.
- Let "make tidy" add changes, prevent others.
Change-Id: I3e7d9c11dd26853ed1b8bbb6b6eba3f6252046b3
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/src/arch/aarch64/plat/ffa/absent.c b/src/arch/aarch64/plat/ffa/absent.c
index 879f5c6..4eecac1 100644
--- a/src/arch/aarch64/plat/ffa/absent.c
+++ b/src/arch/aarch64/plat/ffa/absent.c
@@ -24,9 +24,9 @@
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t current_id, const struct vm *target)
+ ffa_vm_id_t vm_id, const struct vm *target)
{
- (void)current_id;
+ (void)vm_id;
(void)target;
return 0;
}
diff --git a/src/arch/aarch64/plat/ffa/hypervisor.c b/src/arch/aarch64/plat/ffa/hypervisor.c
index 863af36..8a38579 100644
--- a/src/arch/aarch64/plat/ffa/hypervisor.c
+++ b/src/arch/aarch64/plat/ffa/hypervisor.c
@@ -8,6 +8,7 @@
#include "hf/arch/ffa.h"
#include "hf/arch/other_world.h"
+#include "hf/arch/plat/ffa.h"
#include "hf/dlog.h"
#include "hf/ffa.h"
@@ -377,11 +378,10 @@
return true;
}
-bool plat_ffa_vm_notifications_info_get(const uint16_t *ids,
- const uint32_t *ids_count,
- const uint32_t *lists_sizes,
- const uint32_t *lists_count,
- const uint32_t ids_count_max)
+bool plat_ffa_vm_notifications_info_get( // NOLINTNEXTLINE
+ uint16_t *ids, uint32_t *ids_count, // NOLINTNEXTLINE
+ uint32_t *lists_sizes, // NOLINTNEXTLINE
+ uint32_t *lists_count, const uint32_t ids_count_max)
{
(void)ids;
(void)ids_count;
diff --git a/src/arch/aarch64/plat/ffa/spmc.c b/src/arch/aarch64/plat/ffa/spmc.c
index 669a3ca..b48b7c5 100644
--- a/src/arch/aarch64/plat/ffa/spmc.c
+++ b/src/arch/aarch64/plat/ffa/spmc.c
@@ -7,6 +7,7 @@
*/
#include "hf/arch/ffa.h"
+#include "hf/arch/plat/ffa.h"
#include "hf/arch/sve.h"
#include "hf/api.h"
@@ -420,10 +421,12 @@
}
bool plat_ffa_notifications_bitmap_create_call(ffa_vm_id_t vm_id,
- ffa_vcpu_count_t vcpu_count)
+ ffa_vcpu_count_t vcpu_count,
+ struct ffa_value *ret)
{
(void)vm_id;
(void)vcpu_count;
+ (void)ret;
return false;
}
diff --git a/src/arch/fake/hypervisor/ffa.c b/src/arch/fake/hypervisor/ffa.c
index baf14e3..1f6b587 100644
--- a/src/arch/fake/hypervisor/ffa.c
+++ b/src/arch/fake/hypervisor/ffa.c
@@ -8,6 +8,8 @@
#include "hf/ffa.h"
+#include "hf/arch/plat/ffa.h"
+
#include "hf/ffa_internal.h"
#include "hf/vcpu.h"
#include "hf/vm.h"
@@ -107,9 +109,9 @@
}
ffa_partition_properties_t plat_ffa_partition_properties(
- ffa_vm_id_t current_id, const struct vm *target)
+ ffa_vm_id_t vm_id, const struct vm *target)
{
- (void)current_id;
+ (void)vm_id;
(void)target;
return 0;
}
@@ -149,7 +151,8 @@
bool plat_ffa_notifications_get_from_sp(
struct vm_locked receiver_locked, ffa_vcpu_index_t vcpu_id,
- const ffa_notifications_bitmap_t *from_sp, struct ffa_value *ret)
+ ffa_notifications_bitmap_t *from_sp, // NOLINT
+ struct ffa_value *ret) // NOLINT
{
(void)receiver_locked;
(void)vcpu_id;
@@ -202,11 +205,10 @@
return false;
}
-bool plat_ffa_vm_notifications_info_get(const uint16_t *ids,
- const uint32_t *ids_count,
- const uint32_t *lists_sizes,
- const uint32_t *lists_count,
- const uint32_t ids_count_max)
+bool plat_ffa_vm_notifications_info_get( // NOLINTNEXTLINE
+ uint16_t *ids, uint32_t *ids_count, // NOLINTNEXTLINE
+ uint32_t *lists_sizes, // NOLINTNEXTLINE
+ uint32_t *lists_count, const uint32_t ids_count_max)
{
(void)ids;
(void)ids_count;