Unverified Commit 0dcdf842 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown
Browse files

ASoC: SOF: add a "core" parameter to widget loading functions 



We want to be able to explicitly assign cores to individual pipeline
components. This patch adds a "core" parameter to widget loading
functions to be sent to the DSP for appropriate component scheduling.

Signed-off-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200902140756.1427005-2-kai.vehmanen@linux.intel.com


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

sound/soc/sof/sof-priv.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ extern int sof_core_debug; 
	(IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_ENABLE_DEBUGFS_CACHE) || \

	 IS_ENABLED(CONFIG_SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST))



/* So far the primary core on all DSPs has ID 0 */

#define SOF_DSP_PRIMARY_CORE 0



/* DSP power state */

enum sof_dsp_power_states {

	SOF_DSP_PM_D0,

sound/soc/sof/topology.c

+47 −27
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, 
}



static int sof_widget_load_dai(struct snd_soc_component *scomp, int index,

			       struct snd_sof_widget *swidget,

			       struct snd_sof_widget *swidget, int core,

			       struct snd_soc_tplg_dapm_widget *tw,

			       struct sof_ipc_comp_reply *r,

			       struct snd_sof_dai *dai)
@@ -1377,6 +1377,7 @@ static int sof_widget_load_dai(struct snd_soc_component *scomp, int index, 
	comp_dai.comp.id = swidget->comp_id;

	comp_dai.comp.type = SOF_COMP_DAI;

	comp_dai.comp.pipeline_id = index;

	comp_dai.comp.core = core;

	comp_dai.config.hdr.size = sizeof(comp_dai.config);



	ret = sof_parse_tokens(scomp, &comp_dai, dai_tokens,
@@ -1417,7 +1418,7 @@ static int sof_widget_load_dai(struct snd_soc_component *scomp, int index, 
 */



static int sof_widget_load_buffer(struct snd_soc_component *scomp, int index,

				  struct snd_sof_widget *swidget,

				  struct snd_sof_widget *swidget, int core,

				  struct snd_soc_tplg_dapm_widget *tw,

				  struct sof_ipc_comp_reply *r)

{
@@ -1436,6 +1437,7 @@ static int sof_widget_load_buffer(struct snd_soc_component *scomp, int index, 
	buffer->comp.id = swidget->comp_id;

	buffer->comp.type = SOF_COMP_BUFFER;

	buffer->comp.pipeline_id = index;

	buffer->comp.core = core;



	ret = sof_parse_tokens(scomp, buffer, buffer_tokens,

			       ARRAY_SIZE(buffer_tokens), private->array,
@@ -1487,7 +1489,7 @@ static int spcm_bind(struct snd_soc_component *scomp, struct snd_sof_pcm *spcm, 
 */



static int sof_widget_load_pcm(struct snd_soc_component *scomp, int index,

			       struct snd_sof_widget *swidget,

			       struct snd_sof_widget *swidget, int core,

			       enum sof_ipc_stream_direction dir,

			       struct snd_soc_tplg_dapm_widget *tw,

			       struct sof_ipc_comp_reply *r)
@@ -1507,6 +1509,7 @@ static int sof_widget_load_pcm(struct snd_soc_component *scomp, int index, 
	host->comp.id = swidget->comp_id;

	host->comp.type = SOF_COMP_HOST;

	host->comp.pipeline_id = index;

	host->comp.core = core;

	host->direction = dir;

	host->config.hdr.size = sizeof(host->config);
@@ -1592,8 +1595,8 @@ int sof_load_pipeline_ipc(struct device *dev, 
	return ret;

}



static int sof_widget_load_pipeline(struct snd_soc_component *scomp,

				    int index, struct snd_sof_widget *swidget,

static int sof_widget_load_pipeline(struct snd_soc_component *scomp, int index,

				    struct snd_sof_widget *swidget,

				    struct snd_soc_tplg_dapm_widget *tw,

				    struct sof_ipc_comp_reply *r)

{
@@ -1655,7 +1658,7 @@ err: 
 */



static int sof_widget_load_mixer(struct snd_soc_component *scomp, int index,

				 struct snd_sof_widget *swidget,

				 struct snd_sof_widget *swidget, int core,

				 struct snd_soc_tplg_dapm_widget *tw,

				 struct sof_ipc_comp_reply *r)

{
@@ -1674,6 +1677,7 @@ static int sof_widget_load_mixer(struct snd_soc_component *scomp, int index, 
	mixer->comp.id = swidget->comp_id;

	mixer->comp.type = SOF_COMP_MIXER;

	mixer->comp.pipeline_id = index;

	mixer->comp.core = core;

	mixer->config.hdr.size = sizeof(mixer->config);



	ret = sof_parse_tokens(scomp, &mixer->config, comp_tokens,
@@ -1702,7 +1706,7 @@ static int sof_widget_load_mixer(struct snd_soc_component *scomp, int index, 
 * Mux topology

 */

static int sof_widget_load_mux(struct snd_soc_component *scomp, int index,

			       struct snd_sof_widget *swidget,

			       struct snd_sof_widget *swidget, int core,

			       struct snd_soc_tplg_dapm_widget *tw,

			       struct sof_ipc_comp_reply *r)

{
@@ -1721,6 +1725,7 @@ static int sof_widget_load_mux(struct snd_soc_component *scomp, int index, 
	mux->comp.id = swidget->comp_id;

	mux->comp.type = SOF_COMP_MUX;

	mux->comp.pipeline_id = index;

	mux->comp.core = core;

	mux->config.hdr.size = sizeof(mux->config);



	ret = sof_parse_tokens(scomp, &mux->config, comp_tokens,
@@ -1750,7 +1755,7 @@ static int sof_widget_load_mux(struct snd_soc_component *scomp, int index, 
 */



static int sof_widget_load_pga(struct snd_soc_component *scomp, int index,

			       struct snd_sof_widget *swidget,

			       struct snd_sof_widget *swidget, int core,

			       struct snd_soc_tplg_dapm_widget *tw,

			       struct sof_ipc_comp_reply *r)

{
@@ -1779,6 +1784,7 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, 
	volume->comp.id = swidget->comp_id;

	volume->comp.type = SOF_COMP_VOLUME;

	volume->comp.pipeline_id = index;

	volume->comp.core = core;

	volume->config.hdr.size = sizeof(volume->config);



	ret = sof_parse_tokens(scomp, volume, volume_tokens,
@@ -1828,7 +1834,7 @@ err: 
 */



static int sof_widget_load_src(struct snd_soc_component *scomp, int index,

			       struct snd_sof_widget *swidget,

			       struct snd_sof_widget *swidget, int core,

			       struct snd_soc_tplg_dapm_widget *tw,

			       struct sof_ipc_comp_reply *r)

{
@@ -1847,6 +1853,7 @@ static int sof_widget_load_src(struct snd_soc_component *scomp, int index, 
	src->comp.id = swidget->comp_id;

	src->comp.type = SOF_COMP_SRC;

	src->comp.pipeline_id = index;

	src->comp.core = core;

	src->config.hdr.size = sizeof(src->config);



	ret = sof_parse_tokens(scomp, src, src_tokens,
@@ -1887,7 +1894,7 @@ err: 
 */



static int sof_widget_load_asrc(struct snd_soc_component *scomp, int index,

				struct snd_sof_widget *swidget,

				struct snd_sof_widget *swidget, int core,

				struct snd_soc_tplg_dapm_widget *tw,

				struct sof_ipc_comp_reply *r)

{
@@ -1906,6 +1913,7 @@ static int sof_widget_load_asrc(struct snd_soc_component *scomp, int index, 
	asrc->comp.id = swidget->comp_id;

	asrc->comp.type = SOF_COMP_ASRC;

	asrc->comp.pipeline_id = index;

	asrc->comp.core = core;

	asrc->config.hdr.size = sizeof(asrc->config);



	ret = sof_parse_tokens(scomp, asrc, asrc_tokens,
@@ -1948,7 +1956,7 @@ err: 
 */



static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index,

				  struct snd_sof_widget *swidget,

				  struct snd_sof_widget *swidget, int core,

				  struct snd_soc_tplg_dapm_widget *tw,

				  struct sof_ipc_comp_reply *r)

{
@@ -1967,6 +1975,7 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, 
	tone->comp.id = swidget->comp_id;

	tone->comp.type = SOF_COMP_TONE;

	tone->comp.pipeline_id = index;

	tone->comp.core = core;

	tone->config.hdr.size = sizeof(tone->config);



	ret = sof_parse_tokens(scomp, tone, tone_tokens,
@@ -2204,7 +2213,7 @@ out: 
 */



static int sof_widget_load_process(struct snd_soc_component *scomp, int index,

				   struct snd_sof_widget *swidget,

				   struct snd_sof_widget *swidget, int core,

				   struct snd_soc_tplg_dapm_widget *tw,

				   struct sof_ipc_comp_reply *r)

{
@@ -2219,6 +2228,7 @@ static int sof_widget_load_process(struct snd_soc_component *scomp, int index, 
	}



	memset(&config, 0, sizeof(config));

	config.comp.core = core;



	/* get the process token */

	ret = sof_parse_tokens(scomp, &config, process_tokens,
@@ -2283,6 +2293,9 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
	struct snd_sof_dai *dai;

	struct sof_ipc_comp_reply reply;

	struct snd_sof_control *scontrol;

	struct sof_ipc_comp comp = {

		.core = SOF_DSP_PRIMARY_CORE,

	};

	int ret = 0;



	swidget = kzalloc(sizeof(*swidget), GFP_KERNEL);
@@ -2313,8 +2326,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
			return -ENOMEM;

		}



		ret = sof_widget_load_dai(scomp, index, swidget, tw, &reply,

					  dai);

		ret = sof_widget_load_dai(scomp, index, swidget, comp.core,

					  tw, &reply, dai);

		if (ret == 0) {

			sof_connect_dai_widget(scomp, w, tw, dai);

			list_add(&dai->list, &sdev->dai_list);
@@ -2324,10 +2337,12 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
		}

		break;

	case snd_soc_dapm_mixer:

		ret = sof_widget_load_mixer(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_mixer(scomp, index, swidget, comp.core,

					    tw, &reply);

		break;

	case snd_soc_dapm_pga:

		ret = sof_widget_load_pga(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_pga(scomp, index, swidget, comp.core,

					  tw, &reply);

		/* Find scontrol for this pga and set readback offset*/

		list_for_each_entry(scontrol, &sdev->kcontrol_list, list) {

			if (scontrol->comp_id == swidget->comp_id) {
@@ -2337,36 +2352,41 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
		}

		break;

	case snd_soc_dapm_buffer:

		ret = sof_widget_load_buffer(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_buffer(scomp, index, swidget, comp.core,

					     tw, &reply);

		break;

	case snd_soc_dapm_scheduler:

		ret = sof_widget_load_pipeline(scomp, index, swidget, tw,

					       &reply);

		ret = sof_widget_load_pipeline(scomp, index, swidget,

					       tw, &reply);

		break;

	case snd_soc_dapm_aif_out:

		ret = sof_widget_load_pcm(scomp, index, swidget,

		ret = sof_widget_load_pcm(scomp, index, swidget, comp.core,

					  SOF_IPC_STREAM_CAPTURE, tw, &reply);

		break;

	case snd_soc_dapm_aif_in:

		ret = sof_widget_load_pcm(scomp, index, swidget,

		ret = sof_widget_load_pcm(scomp, index, swidget, comp.core,

					  SOF_IPC_STREAM_PLAYBACK, tw, &reply);

		break;

	case snd_soc_dapm_src:

		ret = sof_widget_load_src(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_src(scomp, index, swidget, comp.core,

					  tw, &reply);

		break;

	case snd_soc_dapm_asrc:

		ret = sof_widget_load_asrc(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_asrc(scomp, index, swidget, comp.core,

					   tw, &reply);

		break;

	case snd_soc_dapm_siggen:

		ret = sof_widget_load_siggen(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_siggen(scomp, index, swidget, comp.core,

					     tw, &reply);

		break;

	case snd_soc_dapm_effect:

		ret = sof_widget_load_process(scomp, index, swidget, tw,

					      &reply);

		ret = sof_widget_load_process(scomp, index, swidget, comp.core,

					      tw, &reply);

		break;

	case snd_soc_dapm_mux:

	case snd_soc_dapm_demux:

		ret = sof_widget_load_mux(scomp, index, swidget, tw, &reply);

		ret = sof_widget_load_mux(scomp, index, swidget, comp.core,

					  tw, &reply);

		break;

	case snd_soc_dapm_switch:

	case snd_soc_dapm_dai_link:

CRA Git | Maintained and supported by SUSTech CRA and CCSE