Unverified Commit e0c8a67f authored by Mark Brown's avatar Mark Brown
Browse files

SoC: SOF: ipc: Optimizations for tx message 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

The series will drop the internal use of 'header' parameter which is always
set to hdr->cmd.

The other simplification is to use the provided message directly as it is
guarantied to be valid throughout the message sending and we can save memory
by not allocating a temporary buffer, also saving on needles memcpy()
operations.
parents a3a2a21a 2acfab71

sound/soc/sof/intel/cnl.c

+2 −4
Original line number Diff line number Diff line
@@ -161,11 +161,9 @@ static void cnl_ipc_dsp_done(struct snd_sof_dev *sdev) 
static bool cnl_compact_ipc_compress(struct snd_sof_ipc_msg *msg,

				     u32 *dr, u32 *dd)

{

	struct sof_ipc_pm_gate *pm_gate;



	if (msg->header == (SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_GATE)) {

		pm_gate = msg->msg_data;

	struct sof_ipc_pm_gate *pm_gate = msg->msg_data;



	if (pm_gate->hdr.cmd == (SOF_IPC_GLB_PM_MSG | SOF_IPC_PM_GATE)) {

		/* send the compact message via the primary register */

		*dr = HDA_IPC_MSG_COMPACT | HDA_IPC_PM_GATE;

sound/soc/sof/ipc.c

+12 −12
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 */

	msg->msg_data = msg_data;

	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,
@@ -1000,9 +1003,6 @@ int sof_ipc_init_msg_memory(struct snd_sof_dev *sdev) 
	struct snd_sof_ipc_msg *msg;



	msg = &sdev->ipc->msg;

	msg->msg_data = devm_kzalloc(sdev->dev, SOF_IPC_MSG_MAX_SIZE, GFP_KERNEL);

	if (!msg->msg_data)

		return -ENOMEM;



	msg->reply_data = devm_kzalloc(sdev->dev, SOF_IPC_MSG_MAX_SIZE, GFP_KERNEL);

	if (!msg->reply_data)