fix(rss): fix build issues with comms protocol

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I77d2d3c5ac39a840b768f84f859d76b3965749aa

diff --git a/drivers/arm/rss/rss_comms.c b/drivers/arm/rss/rss_comms.c
index 0633c61b1ef841cf43cec90a7b122410e3507ccc..a1f5daa5af9069cda2b3d8ee7ae6fc0f96e6b62b 100644 (file)
--- a/drivers/arm/rss/rss_comms.c
+++ b/drivers/arm/rss/rss_comms.c
@@ -70,6 +70,10 @@ static uint8_t select_protocol_version(const psa_invec *in_vec, size_t in_len,
 psa_status_t psa_call(psa_handle_t handle, int32_t type, const psa_invec *in_vec, size_t in_len,
                      psa_outvec *out_vec, size_t out_len)
 {
+       /* Declared statically to avoid using huge amounts of stack space. Maybe revisit if
+        * functions not being reentrant becomes a problem.
+        */
+       static union rss_comms_io_buffer_t io_buf;
        enum mhu_error_t err;
        psa_status_t status;
        static uint8_t seq_num = 1U;
@@ -77,10 +81,6 @@ psa_status_t psa_call(psa_handle_t handle, int32_t type, const psa_invec *in_vec
        size_t reply_size = sizeof(io_buf.reply);
        psa_status_t return_val;
        size_t idx;
-       /* Declared statically to avoid using huge amounts of stack space. Maybe revisit if
-        * functions not being reentrant becomes a problem.
-        */
-       static union rss_comms_io_buffer_t io_buf;
 
        if (type > INT16_MAX || type < INT16_MIN || in_len > PSA_MAX_IOVEC
            || out_len > PSA_MAX_IOVEC) {

diff --git a/drivers/arm/rss/rss_comms_protocol.c b/drivers/arm/rss/rss_comms_protocol.c
index 4b3de54e83f626aaad3edd874010ae6f4e5c30d0..a8d1dda1af20cab633e9504fefbbf042caaaa838 100644 (file)
--- a/drivers/arm/rss/rss_comms_protocol.c
+++ b/drivers/arm/rss/rss_comms_protocol.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
+#include <assert.h>
 
 #include <common/debug.h>
 #include "rss_comms_protocol.h"

diff --git a/drivers/arm/rss/rss_comms_protocol_embed.c b/drivers/arm/rss/rss_comms_protocol_embed.c
index fc348d2b5d1ef6a5bbaaa0da1d53955316b712cb..d21734013742dddc946edc236a9623b8d64dbc20 100644 (file)
--- a/drivers/arm/rss/rss_comms_protocol_embed.c
+++ b/drivers/arm/rss/rss_comms_protocol_embed.c
@@ -5,7 +5,7 @@
  *
  */
 
-
+#include <assert.h>
 #include <string.h>
 
 #include <common/debug.h>

diff --git a/drivers/arm/rss/rss_comms_protocol_pointer_access.c b/drivers/arm/rss/rss_comms_protocol_pointer_access.c
index 4eed960aa1610682dc223adf62fa794046a75c30..55c2675a1e064f01ff5188d9a4790d2765782051 100644 (file)
--- a/drivers/arm/rss/rss_comms_protocol_pointer_access.c
+++ b/drivers/arm/rss/rss_comms_protocol_pointer_access.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
+#include <assert.h>
 
 #include "rss_comms_protocol_pointer_access.h"