Commit bf322084 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Make optee support sync_cmds_completed_on_ret 

Declare each OPTEE SCMI channel as not having a completion_irq so as to
enable polling mode and then enable also .sync_cmds_completed_on_ret flag
in the OPTEE transport descriptor so that real polling is itself
effectively bypassed on the rx path: once the optee command invocation has
successfully returned the core will directly fetch the response from the
shared memory area.

Remove OPTEE SCMI transport specific .poll_done callback support since
real polling is effectively bypassed when .sync_cmds_completed_on_ret is
set.

Add OPTEE SCMI transport specific .mark_txdone callback support in order to
properly handle channel locking along the tx path.

Link: https://lore.kernel.org/r/20211220195646.44498-6-cristian.marussi@arm.com


Cc: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 117542b8

drivers/firmware/arm_scmi/optee.c

+9 −8
Original line number Diff line number Diff line
@@ -363,6 +363,9 @@ static int scmi_optee_chan_setup(struct scmi_chan_info *cinfo, struct device *de 
	if (ret)

		goto err_close_sess;



	/* Enable polling */

	cinfo->no_completion_irq = true;



	mutex_lock(&scmi_optee_private->mu);

	list_add(&channel->link, &scmi_optee_private->channel_list);

	mutex_unlock(&scmi_optee_private->mu);
@@ -423,8 +426,7 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo, 
	shmem_tx_prepare(shmem, xfer);



	ret = invoke_process_smt_channel(channel);



	scmi_rx_callback(cinfo, shmem_read_header(shmem), NULL);

	if (ret)

		mutex_unlock(&channel->mu);



	return ret;
@@ -439,13 +441,11 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo, 
	shmem_fetch_response(shmem, xfer);

}



static bool scmi_optee_poll_done(struct scmi_chan_info *cinfo,

				 struct scmi_xfer *xfer)

static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret)

{

	struct scmi_optee_channel *channel = cinfo->transport_info;

	struct scmi_shared_mem *shmem = get_channel_shm(channel, xfer);



	return shmem_poll_done(shmem, xfer);

	mutex_unlock(&channel->mu);

}



static struct scmi_transport_ops scmi_optee_ops = {
@@ -454,9 +454,9 @@ static struct scmi_transport_ops scmi_optee_ops = { 
	.chan_setup = scmi_optee_chan_setup,

	.chan_free = scmi_optee_chan_free,

	.send_message = scmi_optee_send_message,

	.mark_txdone = scmi_optee_mark_txdone,

	.fetch_response = scmi_optee_fetch_response,

	.clear_channel = scmi_optee_clear_channel,

	.poll_done = scmi_optee_poll_done,

};



static int scmi_optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
@@ -562,4 +562,5 @@ const struct scmi_desc scmi_optee_desc = { 
	.max_rx_timeout_ms = 30,

	.max_msg = 20,

	.max_msg_size = SCMI_OPTEE_MAX_MSG_SIZE,

	.sync_cmds_completed_on_ret = true,

};