Unverified Commit 6327c729 authored by Chao Song's avatar Chao Song Committed by Mark Brown
Browse files

ASoC: SOF: Add support for parsing the number of sink/source pins 



Add support for parsing the number of sink/source pins
per widget from topology. They will be used to determine
the sink/source queue IDs during widget binding.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarChao Song <chao.song@linux.intel.com>
Suggested-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 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/20221107085706.2550-2-peter.ujfalusi@linux.intel.com


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

include/uapi/sound/sof/tokens.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ 
#define SOF_TKN_COMP_CPC			406

#define SOF_TKN_COMP_IS_PAGES			409

#define SOF_TKN_COMP_NUM_AUDIO_FORMATS		410

#define SOF_TKN_COMP_NUM_SINK_PINS		411

#define SOF_TKN_COMP_NUM_SOURCE_PINS		412



/* SSP */

#define SOF_TKN_INTEL_SSP_CLKS_CONTROL		500

sound/soc/sof/sof-audio.h

+15 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 


#define SOF_AUDIO_PCM_DRV_NAME	"sof-audio-component"



/*

 * The ipc4 firmware only supports up to 8 sink or source pins

 * per widget, because only 3 bits are used for queue(pin) ID

 * in ipc4 protocol.

 */

#define SOF_WIDGET_MAX_NUM_PINS	8



/* max number of FE PCMs before BEs */

#define SOF_BE_PCM_BASE		16
@@ -387,6 +394,14 @@ struct snd_sof_widget { 
	int num_tuples;

	struct snd_sof_tuple *tuples;



	/*

	 * The allowed range for num_sink/source_pins is [0, SOF_WIDGET_MAX_NUM_PINS].

	 * Widgets may have zero sink or source pins, for example the tone widget has

	 * zero sink pins.

	 */

	u32 num_sink_pins;

	u32 num_source_pins;



	void *private;		/* core does not touch this */

};

sound/soc/sof/topology.c

+29 −4
Original line number Diff line number Diff line
@@ -392,6 +392,13 @@ static const struct sof_topology_token led_tokens[] = { 
		offsetof(struct snd_sof_led_control, direction)},

};



static const struct sof_topology_token comp_pin_tokens[] = {

	{SOF_TKN_COMP_NUM_SINK_PINS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct snd_sof_widget, num_sink_pins)},

	{SOF_TKN_COMP_NUM_SOURCE_PINS, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct snd_sof_widget, num_source_pins)},

};



/**

 * sof_parse_uuid_tokens - Parse multiple sets of UUID tokens

 * @scomp: pointer to soc component
@@ -1259,6 +1266,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);

	const struct sof_ipc_tplg_ops *ipc_tplg_ops = sdev->ipc->ops->tplg;

	const struct sof_ipc_tplg_widget_ops *widget_ops = ipc_tplg_ops->widget;

	struct snd_soc_tplg_private *priv = &tw->priv;

	struct snd_sof_widget *swidget;

	struct snd_sof_dai *dai;

	enum sof_tokens *token_list;
@@ -1277,10 +1285,27 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
	swidget->pipeline_id = index;

	swidget->private = NULL;



	dev_dbg(scomp->dev, "tplg: ready widget id %d pipe %d type %d name : %s stream %s\n",

		swidget->comp_id, index, swidget->id, tw->name,

		strnlen(tw->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0

			? tw->sname : "none");

	ret = sof_parse_tokens(scomp, swidget, comp_pin_tokens,

			       ARRAY_SIZE(comp_pin_tokens), priv->array,

			       le32_to_cpu(priv->size));

	if (ret < 0) {

		dev_err(scomp->dev, "failed to parse component pin tokens for %s\n",

			w->name);

		return ret;

	}



	if (swidget->num_sink_pins > SOF_WIDGET_MAX_NUM_PINS ||

	    swidget->num_source_pins > SOF_WIDGET_MAX_NUM_PINS) {

		dev_err(scomp->dev, "invalid pins for %s: [sink: %d, src: %d]\n",

			swidget->widget->name, swidget->num_sink_pins, swidget->num_source_pins);

		return -EINVAL;

	}



	dev_dbg(scomp->dev,

		"tplg: widget %d (%s) is ready [type: %d, pipe: %d, pins: %d / %d, stream: %s]\n",

		swidget->comp_id, w->name, swidget->id, index,

		swidget->num_sink_pins, swidget->num_source_pins,

		strnlen(w->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) > 0 ? w->sname : "none");



	token_list = widget_ops[w->id].token_list;

	token_list_size = widget_ops[w->id].token_list_size;