Unverified Commit 9c04363d authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Introduce struct snd_sof_pipeline 



Introduce struct snd_sof_pipeline to save the information about
pipelines including the pipeline widget, their status wrt how many PCM's
are using them and whether they are complete or not.

In struct snd_sof_widget, replace pipe_widget with spipe and remove
complete. In struct snd_sof_pcm_stream_pipeline_list, replace
pipe_widgets with pipelines.

Update all users accordingly.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-13-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/core.c

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data) 
	INIT_LIST_HEAD(&sdev->pcm_list);

	INIT_LIST_HEAD(&sdev->kcontrol_list);

	INIT_LIST_HEAD(&sdev->widget_list);

	INIT_LIST_HEAD(&sdev->pipeline_list);

	INIT_LIST_HEAD(&sdev->dai_list);

	INIT_LIST_HEAD(&sdev->dai_link_list);

	INIT_LIST_HEAD(&sdev->route_list);

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

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int ipc4_hda_dai_trigger(struct snd_pcm_substream *substream, 


	w = snd_soc_dai_get_widget(dai, substream->stream);

	swidget = w->dobj.private;

	pipe_widget = swidget->pipe_widget;

	pipe_widget = swidget->spipe->pipe_widget;

	pipeline = pipe_widget->private;



	switch (cmd) {

sound/soc/sof/ipc3-topology.c

+5 −4
Original line number Diff line number Diff line
@@ -2233,9 +2233,9 @@ static int sof_ipc3_set_up_all_pipelines(struct snd_sof_dev *sdev, bool verify) 
					return ret;

			}



			swidget->complete = sof_ipc3_complete_pipeline(sdev, swidget);

			if (swidget->complete < 0)

				return swidget->complete;

			swidget->spipe->complete = sof_ipc3_complete_pipeline(sdev, swidget);

			if (swidget->spipe->complete < 0)

				return swidget->spipe->complete;

			break;

		default:

			break;
@@ -2317,7 +2317,8 @@ static int sof_ipc3_tear_down_all_pipelines(struct snd_sof_dev *sdev, bool verif 
		if (!verify && !swidget->dynamic_pipeline_widget &&

		    SOF_FW_VER(v->major, v->minor, v->micro) < SOF_FW_VER(2, 2, 0)) {

			swidget->use_count = 0;

			swidget->complete = 0;

			if (swidget->spipe)

				swidget->spipe->complete = 0;

			continue;

		}

sound/soc/sof/ipc4-pcm.c

+13 −10
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
	struct ipc4_pipeline_set_state_data *data;

	struct snd_sof_widget *pipe_widget;

	struct sof_ipc4_pipeline *pipeline;

	struct snd_sof_pipeline *spipe;

	struct snd_sof_pcm *spcm;

	int ret;

	int i, j;
@@ -79,7 +80,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
	pipeline_list = &spcm->stream[substream->stream].pipeline_list;



	/* nothing to trigger if the list is empty */

	if (!pipeline_list->pipe_widgets)

	if (!pipeline_list->pipelines)

		return 0;



	/* allocate memory for the pipeline data */
@@ -96,7 +97,8 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
	 * sink->source would still be guaranteed for each fork independently.

	 */

	for (i = pipeline_list->count - 1; i >= 0; i--) {

		pipe_widget = pipeline_list->pipe_widgets[i];

		spipe = pipeline_list->pipelines[i];

		pipe_widget = spipe->pipe_widget;

		pipeline = pipe_widget->private;

		if (pipeline->state != state && !pipeline->skip_during_fe_trigger)

			data->pipeline_ids[data->count++] = pipe_widget->instance_id;
@@ -122,7 +124,8 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
	/* update PAUSED state for all pipelines that were just triggered */

	for (i = 0; i < data->count; i++) {

		for (j = 0; j < pipeline_list->count; j++) {

			pipe_widget = pipeline_list->pipe_widgets[j];

			spipe = pipeline_list->pipelines[j];

			pipe_widget = spipe->pipe_widget;

			pipeline = pipe_widget->private;



			if (data->pipeline_ids[i] == pipe_widget->instance_id) {
@@ -146,7 +149,8 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
	/* update final state for all pipelines that were just triggered */

	for (i = 0; i < data->count; i++) {

		for (j = 0; j < pipeline_list->count; j++) {

			pipe_widget = pipeline_list->pipe_widgets[j];

			spipe = pipeline_list->pipelines[j];

			pipe_widget = spipe->pipe_widget;

			pipeline = pipe_widget->private;



			if (data->pipeline_ids[i] == pipe_widget->instance_id) {
@@ -274,8 +278,8 @@ static void sof_ipc4_pcm_free(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm 


	for_each_pcm_streams(stream) {

		pipeline_list = &spcm->stream[stream].pipeline_list;

		kfree(pipeline_list->pipe_widgets);

		pipeline_list->pipe_widgets = NULL;

		kfree(pipeline_list->pipelines);

		pipeline_list->pipelines = NULL;

	}

}
@@ -289,10 +293,9 @@ static int sof_ipc4_pcm_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm 
		pipeline_list = &spcm->stream[stream].pipeline_list;



		/* allocate memory for max number of pipeline IDs */

		pipeline_list->pipe_widgets = kcalloc(ipc4_data->max_num_pipelines,

						      sizeof(struct snd_sof_widget *),

						      GFP_KERNEL);

		if (!pipeline_list->pipe_widgets) {

		pipeline_list->pipelines = kcalloc(ipc4_data->max_num_pipelines,

						   sizeof(struct snd_sof_widget *), GFP_KERNEL);

		if (!pipeline_list->pipelines) {

			sof_ipc4_pcm_free(sdev, spcm);

			return -ENOMEM;

		}

sound/soc/sof/ipc4-topology.c

+6 −6
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ sof_ipc4_update_pipeline_mem_usage(struct snd_sof_dev *sdev, struct snd_sof_widg 


	total = SOF_IPC4_FW_PAGE(task_mem + queue_mem);



	pipe_widget = swidget->pipe_widget;

	pipe_widget = swidget->spipe->pipe_widget;

	pipeline = pipe_widget->private;

	pipeline->mem_usage += total;

}
@@ -969,7 +969,7 @@ static void sof_ipc4_unprepare_copier_module(struct snd_sof_widget *swidget) 
	struct sof_ipc4_pipeline *pipeline;



	/* reset pipeline memory usage */

	pipe_widget = swidget->pipe_widget;

	pipe_widget = swidget->spipe->pipe_widget;

	pipeline = pipe_widget->private;

	pipeline->mem_usage = 0;
@@ -1136,7 +1136,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
		struct snd_sof_widget *pipe_widget;

		struct sof_ipc4_pipeline *pipeline;



		pipe_widget = swidget->pipe_widget;

		pipe_widget = swidget->spipe->pipe_widget;

		pipeline = pipe_widget->private;

		ipc4_copier = (struct sof_ipc4_copier *)swidget->private;

		gtw_attr = ipc4_copier->gtw_attr;
@@ -1495,7 +1495,7 @@ static int sof_ipc4_control_setup(struct snd_sof_dev *sdev, struct snd_sof_contr 


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

{

	struct snd_sof_widget *pipe_widget = swidget->pipe_widget;

	struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;

	struct sof_ipc4_fw_data *ipc4_data = sdev->private;

	struct sof_ipc4_pipeline *pipeline;

	struct sof_ipc4_msg *msg;
@@ -1815,7 +1815,7 @@ static int sof_ipc4_route_free(struct snd_sof_dev *sdev, struct snd_sof_route *s 
	 * routes belonging to the same pipeline will be disconnected by the FW when the pipeline

	 * is freed. So avoid sending this IPC which will be ignored by the FW anyway.

	 */

	if (src_widget->pipe_widget == sink_widget->pipe_widget)

	if (src_widget->spipe->pipe_widget == sink_widget->spipe->pipe_widget)

		goto out;



	header = src_fw_module->man4_module_entry.id;
@@ -1846,7 +1846,7 @@ static int sof_ipc4_route_free(struct snd_sof_dev *sdev, struct snd_sof_route *s 
static int sof_ipc4_dai_config(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,

			       unsigned int flags, struct snd_sof_dai_config_data *data)

{

	struct snd_sof_widget *pipe_widget = swidget->pipe_widget;

	struct snd_sof_widget *pipe_widget = swidget->spipe->pipe_widget;

	struct sof_ipc4_pipeline *pipeline = pipe_widget->private;

	struct snd_sof_dai *dai = swidget->private;

	struct sof_ipc4_gtw_attributes *gtw_attr;