From 70247ddbbd0a55a1ddf1d02f2a35b5cad3949dd1 Mon Sep 17 00:00:00 2001 From: Tamas Ban Date: Wed, 5 Oct 2022 11:56:04 +0200 Subject: [PATCH] fix(rss): rename AP-RSS message size macro Adding PLAT_* prefix to indicate that the platform needs to provide this definition. Signed-off-by: Tamas Ban Change-Id: I0bd02be405fd8b1e625bd2b82647ebb2b58265fc --- drivers/arm/rss/rss_comms.c | 4 ++-- drivers/arm/rss/rss_comms_protocol_embed.h | 4 ++-- plat/arm/board/fvp/platform.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/arm/rss/rss_comms.c b/drivers/arm/rss/rss_comms.c index a1f5daa5a..8b5002f29 100644 --- a/drivers/arm/rss/rss_comms.c +++ b/drivers/arm/rss/rss_comms.c @@ -42,11 +42,11 @@ static uint8_t select_protocol_version(const psa_invec *in_vec, size_t in_len, comms_embed_msg_min_size = sizeof(struct serialized_rss_comms_header_t) + sizeof(struct rss_embed_msg_t) - - RSS_COMMS_PAYLOAD_MAX_SIZE; + PLAT_RSS_COMMS_PAYLOAD_MAX_SIZE; comms_embed_reply_min_size = sizeof(struct serialized_rss_comms_header_t) + sizeof(struct rss_embed_reply_t) - - RSS_COMMS_PAYLOAD_MAX_SIZE; + PLAT_RSS_COMMS_PAYLOAD_MAX_SIZE; /* Use embed if we can pack into one message and reply, else use * pointer_access. The underlying MHU transport protocol uses a diff --git a/drivers/arm/rss/rss_comms_protocol_embed.h b/drivers/arm/rss/rss_comms_protocol_embed.h index 6c2a7bd56..609d099ba 100644 --- a/drivers/arm/rss/rss_comms_protocol_embed.h +++ b/drivers/arm/rss/rss_comms_protocol_embed.h @@ -30,13 +30,13 @@ struct __packed rss_embed_msg_t { psa_handle_t handle; uint32_t ctrl_param; /* type, in_len, out_len */ uint16_t io_size[PSA_MAX_IOVEC]; - uint8_t trailer[RSS_COMMS_PAYLOAD_MAX_SIZE]; + uint8_t trailer[PLAT_RSS_COMMS_PAYLOAD_MAX_SIZE]; }; struct __packed rss_embed_reply_t { int32_t return_val; uint16_t out_size[PSA_MAX_IOVEC]; - uint8_t trailer[RSS_COMMS_PAYLOAD_MAX_SIZE]; + uint8_t trailer[PLAT_RSS_COMMS_PAYLOAD_MAX_SIZE]; }; psa_status_t rss_protocol_embed_serialize_msg(psa_handle_t handle, diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 5a21ff666..e9eb2615a 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -407,8 +407,8 @@ ifneq (${PLAT_RSS_NOT_SUPPORTED},1) BL1_SOURCES += ${RSS_COMMS_SOURCES} BL2_SOURCES += ${RSS_COMMS_SOURCES} - BL1_CFLAGS += -DPLAT_ATTEST_TOKEN_MAX_SIZE=0 - BL2_CFLAGS += -DPLAT_ATTEST_TOKEN_MAX_SIZE=0 + BL1_CFLAGS += -DPLAT_RSS_COMMS_PAYLOAD_MAX_SIZE=0 + BL2_CFLAGS += -DPLAT_RSS_COMMS_PAYLOAD_MAX_SIZE=0 endif endif -- 2.39.5