Unverified Commit 73a548bd authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc: Drop header parameter from sof_ipc_tx_message_unlocked() 



The snd_sof_ipc_msg.header is not used by platform code, there is no need
to update it and the 'header' parameter for sof_ipc_tx_message_unlocked()
can be dropped at the same time.

Instead of using the header parameter passed by the caller (which does by
setting it to the hdr->cmd) use the hdr->cmd directly when logging.

At the same time make sure that there is a message passed to the tx_message
function.
All instances of the tx_message passes an IPC message, this check is placed
to make sure the future users can not introduce bugs.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220128133620.9411-3-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b6988fe

sound/soc/sof/ipc.c

+12 −9
Original line number Diff line number Diff line
@@ -294,14 +294,20 @@ static int tx_wait_done(struct snd_sof_ipc *ipc, struct snd_sof_ipc_msg *msg, 
}



/* send IPC message from host to DSP */

static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header,

static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc,

				       void *msg_data, size_t msg_bytes,

				       void *reply_data, size_t reply_bytes)

{

	struct sof_ipc_cmd_hdr *hdr = msg_data;

	struct snd_sof_dev *sdev = ipc->sdev;

	struct snd_sof_ipc_msg *msg;

	int ret;



	if (!msg_data || msg_bytes < sizeof(*hdr)) {

		dev_err_ratelimited(sdev->dev, "No IPC message to send\n");

		return -EINVAL;

	}



	if (ipc->disable_ipc_tx || sdev->fw_state != SOF_FW_BOOT_COMPLETE)

		return -ENODEV;
@@ -314,15 +320,13 @@ static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header, 
	/* initialise the message */

	msg = &ipc->msg;



	msg->header = header;

	/* attach message data */

	memcpy(msg->msg_data, msg_data, msg_bytes);

	msg->msg_size = msg_bytes;



	msg->reply_size = reply_bytes;

	msg->reply_error = 0;



	/* attach any data */

	if (msg_bytes)

		memcpy(msg->msg_data, msg_data, msg_bytes);



	sdev->msg = msg;



	ret = snd_sof_dsp_send_msg(sdev, msg);
@@ -339,7 +343,7 @@ static int sof_ipc_tx_message_unlocked(struct snd_sof_ipc *ipc, u32 header, 
		return ret;

	}



	ipc_log_header(sdev->dev, "ipc tx", msg->header);

	ipc_log_header(sdev->dev, "ipc tx", hdr->cmd);



	/* now wait for completion */

	return tx_wait_done(ipc, msg, reply_data);
@@ -385,7 +389,7 @@ int sof_ipc_tx_message_no_pm(struct snd_sof_ipc *ipc, u32 header, 
	/* Serialise IPC TX */

	mutex_lock(&ipc->tx_mutex);



	ret = sof_ipc_tx_message_unlocked(ipc, header, msg_data, msg_bytes,

	ret = sof_ipc_tx_message_unlocked(ipc, msg_data, msg_bytes,

					  reply_data, reply_bytes);



	mutex_unlock(&ipc->tx_mutex);
@@ -789,7 +793,6 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, 
			memcpy(sparams->dst, sparams->src + offset, send_bytes);



		err = sof_ipc_tx_message_unlocked(sdev->ipc,

						  partdata->rhdr.hdr.cmd,

						  partdata,

						  partdata->rhdr.hdr.size,

						  partdata,