Skip to content

Commit 75c8f43

Browse files
vingu-linarosudeep-holla
authored andcommitted
firmware: arm_scmi: Fix response size warning for OPTEE transport
Some protocols check the response size with the expected value but optee shared memory doesn't return such size whereas it is available in the optee output buffer. As an example, the base protocol compares the response size with the expected result when requesting the list of protocol which triggers a warning with optee shared memory: arm-scmi firmware:scmi0: Malformed reply - real_sz:116 calc_sz:4 (loop_num_ret:4) Save the output buffer length and use it when fetching the answer. Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Etienne Carriere <[email protected]> Reviewed-by: Cristian Marussi <[email protected]> Signed-off-by: Vincent Guittot <[email protected]> Signed-off-by: Sudeep Holla <[email protected]>
1 parent 754f04c commit 75c8f43

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/firmware/arm_scmi/optee.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ struct scmi_optee_channel {
117117
u32 channel_id;
118118
u32 tee_session;
119119
u32 caps;
120+
u32 rx_len;
120121
struct mutex mu;
121122
struct scmi_chan_info *cinfo;
122123
union {
@@ -302,6 +303,9 @@ static int invoke_process_msg_channel(struct scmi_optee_channel *channel, size_t
302303
return -EIO;
303304
}
304305

306+
/* Save response size */
307+
channel->rx_len = param[2].u.memref.size;
308+
305309
return 0;
306310
}
307311

@@ -353,6 +357,7 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch
353357
shbuf = tee_shm_get_va(channel->tee_shm, 0);
354358
memset(shbuf, 0, msg_size);
355359
channel->req.msg = shbuf;
360+
channel->rx_len = msg_size;
356361

357362
return 0;
358363
}
@@ -508,7 +513,7 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo,
508513
struct scmi_optee_channel *channel = cinfo->transport_info;
509514

510515
if (channel->tee_shm)
511-
msg_fetch_response(channel->req.msg, SCMI_OPTEE_MAX_MSG_SIZE, xfer);
516+
msg_fetch_response(channel->req.msg, channel->rx_len, xfer);
512517
else
513518
shmem_fetch_response(channel->req.shmem, xfer);
514519
}

0 commit comments

Comments
 (0)