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

ASoC: SOF: add no_reply IPC calls 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Simplify IPC messages to avoid passing a reply structure that is not
used later.
parents 0d587f35 367fd6ff

sound/soc/sof/compress.c

+2 −6
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ static int sof_compr_free(struct snd_soc_component *component, 
	struct sof_compr_stream *sstream = cstream->runtime->private_data;

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	struct snd_sof_pcm *spcm;

	int ret = 0;
@@ -148,8 +147,7 @@ static int sof_compr_free(struct snd_soc_component *component, 
	stream.comp_id = spcm->stream[cstream->direction].comp_id;



	if (spcm->prepared[cstream->direction]) {

		ret = sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

					 &reply, sizeof(reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, &stream, sizeof(stream));

		if (!ret)

			spcm->prepared[cstream->direction] = false;

	}
@@ -273,7 +271,6 @@ static int sof_compr_trigger(struct snd_soc_component *component, 
	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	struct snd_sof_pcm *spcm;



	spcm = snd_sof_find_spcm_dai(component, rtd);
@@ -302,8 +299,7 @@ static int sof_compr_trigger(struct snd_soc_component *component, 
		break;

	}



	return sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

				  &reply, sizeof(reply));

	return sof_ipc_tx_message_no_reply(sdev->ipc, &stream, sizeof(stream));

}



static int sof_compr_copy_playback(struct snd_compr_runtime *rtd,

sound/soc/sof/intel/hda-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ int hda_dsp_ipc4_load_library(struct snd_sof_dev *sdev, 
		goto cleanup;

	}



	ret = sof_ipc_tx_message(sdev->ipc, &msg, 0, NULL, 0);

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &msg, 0);



	ret1 = cl_trigger(sdev, hext_stream, SNDRV_PCM_TRIGGER_STOP);

	if (ret1 < 0) {

sound/soc/sof/ipc3-dtrace.c

+4 −8
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ static int ipc3_trace_update_filter(struct snd_sof_dev *sdev, int num_elems, 
				    struct sof_ipc_trace_filter_elem *elems)

{

	struct sof_ipc_trace_filter *msg;

	struct sof_ipc_reply reply;

	size_t size;

	int ret;
@@ -172,13 +171,13 @@ static int ipc3_trace_update_filter(struct snd_sof_dev *sdev, int num_elems, 
		dev_err(sdev->dev, "enabling device failed: %d\n", ret);

		goto error;

	}

	ret = sof_ipc_tx_message(sdev->ipc, msg, msg->hdr.size, &reply, sizeof(reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, msg, msg->hdr.size);

	pm_runtime_mark_last_busy(sdev->dev);

	pm_runtime_put_autosuspend(sdev->dev);



error:

	kfree(msg);

	return ret ? ret : reply.error;

	return ret;

}



static ssize_t dfsentry_trace_filter_write(struct file *file, const char __user *from,
@@ -434,7 +433,6 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev) 
	struct sof_ipc_fw_ready *ready = &sdev->fw_ready;

	struct sof_ipc_fw_version *v = &ready->version;

	struct sof_ipc_dma_trace_params_ext params;

	struct sof_ipc_reply ipc_reply;

	int ret;



	if (!sdev->fw_trace_is_supported)
@@ -474,7 +472,7 @@ static int ipc3_dtrace_enable(struct snd_sof_dev *sdev) 


	/* send IPC to the DSP */

	priv->dtrace_state = SOF_DTRACE_INITIALIZING;

	ret = sof_ipc_tx_message(sdev->ipc, &params, sizeof(params), &ipc_reply, sizeof(ipc_reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &params, sizeof(params));

	if (ret < 0) {

		dev_err(sdev->dev, "can't set params for DMA for trace %d\n", ret);

		goto trace_release;
@@ -604,7 +602,6 @@ static void ipc3_dtrace_release(struct snd_sof_dev *sdev, bool only_stop) 
	struct sof_ipc_fw_ready *ready = &sdev->fw_ready;

	struct sof_ipc_fw_version *v = &ready->version;

	struct sof_ipc_cmd_hdr hdr;

	struct sof_ipc_reply ipc_reply;

	int ret;



	if (!sdev->fw_trace_is_supported || priv->dtrace_state == SOF_DTRACE_DISABLED)
@@ -623,8 +620,7 @@ static void ipc3_dtrace_release(struct snd_sof_dev *sdev, bool only_stop) 
		hdr.size = sizeof(hdr);

		hdr.cmd = SOF_IPC_GLB_TRACE_MSG | SOF_IPC_TRACE_DMA_FREE;



		ret = sof_ipc_tx_message(sdev->ipc, &hdr, hdr.size,

					 &ipc_reply, sizeof(ipc_reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, &hdr, hdr.size);

		if (ret < 0)

			dev_err(sdev->dev, "DMA_TRACE_FREE failed with error: %d\n", ret);

	}

sound/soc/sof/ipc3-pcm.c

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ static int sof_ipc3_pcm_hw_free(struct snd_soc_component *component, 
	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	struct snd_sof_pcm *spcm;



	spcm = snd_sof_find_spcm_dai(component, rtd);
@@ -34,7 +33,7 @@ static int sof_ipc3_pcm_hw_free(struct snd_soc_component *component, 
	stream.comp_id = spcm->stream[substream->stream].comp_id;



	/* send IPC to the DSP */

	return sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream), &reply, sizeof(reply));

	return sof_ipc_tx_message_no_reply(sdev->ipc, &stream, sizeof(stream));

}



static int sof_ipc3_pcm_hw_params(struct snd_soc_component *component,
@@ -146,7 +145,6 @@ static int sof_ipc3_pcm_trigger(struct snd_soc_component *component, 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	struct snd_sof_pcm *spcm;



	spcm = snd_sof_find_spcm_dai(component, rtd);
@@ -178,7 +176,7 @@ static int sof_ipc3_pcm_trigger(struct snd_soc_component *component, 
	}



	/* send IPC to the DSP */

	return sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream), &reply, sizeof(reply));

	return sof_ipc_tx_message_no_reply(sdev->ipc, &stream, sizeof(stream));

}



static void ssp_dai_config_pcm_params_match(struct snd_sof_dev *sdev, const char *link_name,

sound/soc/sof/ipc3-topology.c

+10 −23
Original line number Diff line number Diff line
@@ -1627,7 +1627,6 @@ static void sof_ipc3_widget_free_comp_dai(struct snd_sof_widget *swidget) 
static int sof_ipc3_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *sroute)

{

	struct sof_ipc_pipe_comp_connect connect;

	struct sof_ipc_reply reply;

	int ret;



	connect.hdr.size = sizeof(connect);
@@ -1640,7 +1639,7 @@ static int sof_ipc3_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route * 
		sroute->sink_widget->widget->name);



	/* send ipc */

	ret = sof_ipc_tx_message(sdev->ipc, &connect, sizeof(connect), &reply, sizeof(reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &connect, sizeof(connect));

	if (ret < 0)

		dev_err(sdev->dev, "%s: route %s -> %s failed\n", __func__,

			sroute->src_widget->widget->name, sroute->sink_widget->widget->name);
@@ -1789,7 +1788,7 @@ static int sof_ipc3_control_free(struct snd_sof_dev *sdev, struct snd_sof_contro 
	fcomp.id = scontrol->comp_id;



	/* send IPC to the DSP */

	return sof_ipc_tx_message(sdev->ipc, &fcomp, sizeof(fcomp), NULL, 0);

	return sof_ipc_tx_message_no_reply(sdev->ipc, &fcomp, sizeof(fcomp));

}



/* send pcm params ipc */
@@ -1797,7 +1796,6 @@ static int sof_ipc3_keyword_detect_pcm_params(struct snd_sof_widget *swidget, in 
{

	struct snd_soc_component *scomp = swidget->scomp;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	struct sof_ipc_pcm_params_reply ipc_params_reply;

	struct snd_pcm_hw_params *params;

	struct sof_ipc_pcm_params pcm;

	struct snd_sof_pcm *spcm;
@@ -1841,8 +1839,7 @@ static int sof_ipc3_keyword_detect_pcm_params(struct snd_sof_widget *swidget, in 
	}



	/* send IPC to the DSP */

	ret = sof_ipc_tx_message(sdev->ipc, &pcm, sizeof(pcm),

				 &ipc_params_reply, sizeof(ipc_params_reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &pcm, sizeof(pcm));

	if (ret < 0)

		dev_err(scomp->dev, "%s: PCM params failed for %s\n", __func__,

			swidget->widget->name);
@@ -1856,7 +1853,6 @@ static int sof_ipc3_keyword_detect_trigger(struct snd_sof_widget *swidget, int c 
	struct snd_soc_component *scomp = swidget->scomp;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	struct sof_ipc_stream stream;

	struct sof_ipc_reply reply;

	int ret;



	/* set IPC stream params */
@@ -1865,7 +1861,7 @@ static int sof_ipc3_keyword_detect_trigger(struct snd_sof_widget *swidget, int c 
	stream.comp_id = swidget->comp_id;



	/* send IPC to the DSP */

	ret = sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream), &reply, sizeof(reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &stream, sizeof(stream));

	if (ret < 0)

		dev_err(scomp->dev, "%s: Failed to trigger %s\n", __func__, swidget->widget->name);
@@ -1982,7 +1978,6 @@ static int sof_ipc3_widget_bind_event(struct snd_soc_component *scomp, 
static int sof_ipc3_complete_pipeline(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)

{

	struct sof_ipc_pipe_ready ready;

	struct sof_ipc_reply reply;

	int ret;



	dev_dbg(sdev->dev, "tplg: complete pipeline %s id %d\n",
@@ -1993,7 +1988,7 @@ static int sof_ipc3_complete_pipeline(struct snd_sof_dev *sdev, struct snd_sof_w 
	ready.hdr.cmd = SOF_IPC_GLB_TPLG_MSG | SOF_IPC_TPLG_PIPE_COMPLETE;

	ready.comp_id = swidget->comp_id;



	ret = sof_ipc_tx_message(sdev->ipc, &ready, sizeof(ready), &reply, sizeof(reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &ready, sizeof(ready));

	if (ret < 0)

		return ret;
@@ -2009,7 +2004,6 @@ static int sof_ipc3_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget 
		},

		.id = swidget->comp_id,

	};

	struct sof_ipc_reply reply;

	int ret;



	if (!swidget->private)
@@ -2029,8 +2023,7 @@ static int sof_ipc3_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget 
		break;

	}



	ret = sof_ipc_tx_message(sdev->ipc, &ipc_free, sizeof(ipc_free),

				 &reply, sizeof(reply));

	ret = sof_ipc_tx_message_no_reply(sdev->ipc, &ipc_free, sizeof(ipc_free));

	if (ret < 0)

		dev_err(sdev->dev, "failed to free widget %s\n", swidget->widget->name);
@@ -2044,7 +2037,6 @@ static int sof_ipc3_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget * 
	struct snd_sof_dai *dai = swidget->private;

	struct sof_dai_private_data *private;

	struct sof_ipc_dai_config *config;

	struct sof_ipc_reply reply;

	int ret = 0;



	if (!dai || !dai->private) {
@@ -2118,8 +2110,7 @@ static int sof_ipc3_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget * 


	/* only send the IPC if the widget is set up in the DSP */

	if (swidget->use_count > 0) {

		ret = sof_ipc_tx_message(sdev->ipc, config, config->hdr.size,

					 &reply, sizeof(reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, config, config->hdr.size);

		if (ret < 0)

			dev_err(sdev->dev, "Failed to set dai config for %s\n", dai->name);
@@ -2132,7 +2123,6 @@ static int sof_ipc3_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget * 


static int sof_ipc3_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)

{

	struct sof_ipc_comp_reply reply;

	int ret;



	if (!swidget->private)
@@ -2146,8 +2136,7 @@ static int sof_ipc3_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget 
		struct sof_dai_private_data *dai_data = dai->private;

		struct sof_ipc_comp *comp = &dai_data->comp_dai->comp;



		ret = sof_ipc_tx_message(sdev->ipc, dai_data->comp_dai,

					 comp->hdr.size, &reply, sizeof(reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, dai_data->comp_dai, comp->hdr.size);

		break;

	}

	case snd_soc_dapm_scheduler:
@@ -2155,8 +2144,7 @@ static int sof_ipc3_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget 
		struct sof_ipc_pipe_new *pipeline;



		pipeline = swidget->private;

		ret = sof_ipc_tx_message(sdev->ipc, pipeline, sizeof(*pipeline),

					 &reply, sizeof(reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, pipeline, sizeof(*pipeline));

		break;

	}

	default:
@@ -2164,8 +2152,7 @@ static int sof_ipc3_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget 
		struct sof_ipc_cmd_hdr *hdr;



		hdr = swidget->private;

		ret = sof_ipc_tx_message(sdev->ipc, swidget->private, hdr->size,

					 &reply, sizeof(reply));

		ret = sof_ipc_tx_message_no_reply(sdev->ipc, swidget->private, hdr->size);

		break;

	}

	}