Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-17 01:54:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(rss): fix build issues with comms protocol" into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2022-10-05 14:44:05 +02:00 • committed by TrustedFirmware Code Review
commit 2ddb5415ca
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/arm/rss/rss_comms.c
View file

@ -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_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) 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; enum mhu_error_t err;
psa_status_t status; psa_status_t status;
static uint8_t seq_num = 1U; 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); size_t reply_size = sizeof(io_buf.reply);
psa_status_t return_val; psa_status_t return_val;
size_t idx; 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 if (type > INT16_MAX || type < INT16_MIN || in_len > PSA_MAX_IOVEC
|| out_len > PSA_MAX_IOVEC) { || out_len > PSA_MAX_IOVEC) {

1
drivers/arm/rss/rss_comms_protocol.c
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
*/ */
#include <assert.h>
#include <common/debug.h> #include <common/debug.h>
#include "rss_comms_protocol.h" #include "rss_comms_protocol.h"

2
drivers/arm/rss/rss_comms_protocol_embed.c
View file

@ -5,7 +5,7 @@
* *
*/ */
#include <assert.h>
#include <string.h> #include <string.h>
#include <common/debug.h> #include <common/debug.h>

1
drivers/arm/rss/rss_comms_protocol_pointer_access.c
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* *
*/ */
#include <assert.h>
#include "rss_comms_protocol_pointer_access.h" #include "rss_comms_protocol_pointer_access.h"