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

ASoC: SOF: topology: Add helper to get/put widget queue id 



Add get/put queue id helper to manage queue id in route
setup and route free.

The queue allocation rules are:

  - If widget only has one sink/source pin, zero will be
returned as the queue ID directly.

  - If widget has more than one sink/source pins, and pin
binding array is defined in topology, queue ID will be
allocated according to the pin binding array.

  - If widget has more than one sink/sink pins, and pin
binding array is not defined, Linux ID allocation will be
used to allocate queue ID dynamically.

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


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

sound/soc/sof/ipc4-topology.c

+120 −13
Original line number Diff line number Diff line
@@ -1577,6 +1577,88 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget 
	return ret;

}



static int sof_ipc4_get_queue_id(struct snd_sof_widget *src_widget,

				 struct snd_sof_widget *sink_widget, bool pin_type)

{

	struct snd_sof_widget *current_swidget;

	struct snd_soc_component *scomp;

	struct ida *queue_ida;

	const char *buddy_name;

	char **pin_binding;

	u32 num_pins;

	int i;



	if (pin_type == SOF_PIN_TYPE_SOURCE) {

		current_swidget = src_widget;

		pin_binding = src_widget->src_pin_binding;

		queue_ida = &src_widget->src_queue_ida;

		num_pins = src_widget->num_source_pins;

		buddy_name = sink_widget->widget->name;

	} else {

		current_swidget = sink_widget;

		pin_binding = sink_widget->sink_pin_binding;

		queue_ida = &sink_widget->sink_queue_ida;

		num_pins = sink_widget->num_sink_pins;

		buddy_name = src_widget->widget->name;

	}



	scomp = current_swidget->scomp;



	if (num_pins < 1) {

		dev_err(scomp->dev, "invalid %s num_pins: %d for queue allocation for %s\n",

			(pin_type == SOF_PIN_TYPE_SOURCE ? "source" : "sink"),

			num_pins, current_swidget->widget->name);

		return -EINVAL;

	}



	/* If there is only one sink/source pin, queue id must be 0 */

	if (num_pins == 1)

		return 0;



	/* Allocate queue ID from pin binding array if it is defined in topology. */

	if (pin_binding) {

		for (i = 0; i < num_pins; i++) {

			if (!strcmp(pin_binding[i], buddy_name))

				return i;

		}

		/*

		 * Fail if no queue ID found from pin binding array, so that we don't

		 * mixed use pin binding array and ida for queue ID allocation.

		 */

		dev_err(scomp->dev, "no %s queue id found from pin binding array for %s\n",

			(pin_type == SOF_PIN_TYPE_SOURCE ? "source" : "sink"),

			current_swidget->widget->name);

		return -EINVAL;

	}



	/* If no pin binding array specified in topology, use ida to allocate one */

	return ida_alloc_max(queue_ida, num_pins, GFP_KERNEL);

}



static void sof_ipc4_put_queue_id(struct snd_sof_widget *swidget, int queue_id,

				  bool pin_type)

{

	struct ida *queue_ida;

	char **pin_binding;

	int num_pins;



	if (pin_type == SOF_PIN_TYPE_SOURCE) {

		pin_binding = swidget->src_pin_binding;

		queue_ida = &swidget->src_queue_ida;

		num_pins = swidget->num_source_pins;

	} else {

		pin_binding = swidget->sink_pin_binding;

		queue_ida = &swidget->sink_queue_ida;

		num_pins = swidget->num_sink_pins;

	}



	/* Nothing to free if queue ID is not allocated with ida. */

	if (num_pins == 1 || pin_binding)

		return;



	ida_free(queue_ida, queue_id);

}



static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route *sroute)

{

	struct snd_sof_widget *src_widget = sroute->src_widget;
@@ -1585,12 +1667,29 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route * 
	struct sof_ipc4_fw_module *sink_fw_module = sink_widget->module_info;

	struct sof_ipc4_msg msg = {{ 0 }};

	u32 header, extension;

	int src_queue = 0;

	int dst_queue = 0;

	int ret;



	dev_dbg(sdev->dev, "bind %s -> %s\n",

		src_widget->widget->name, sink_widget->widget->name);

	sroute->src_queue_id = sof_ipc4_get_queue_id(src_widget, sink_widget,

						     SOF_PIN_TYPE_SOURCE);

	if (sroute->src_queue_id < 0) {

		dev_err(sdev->dev, "failed to get queue ID for source widget: %s\n",

			src_widget->widget->name);

		return sroute->src_queue_id;

	}



	sroute->dst_queue_id = sof_ipc4_get_queue_id(src_widget, sink_widget,

						     SOF_PIN_TYPE_SINK);

	if (sroute->dst_queue_id < 0) {

		dev_err(sdev->dev, "failed to get queue ID for sink widget: %s\n",

			sink_widget->widget->name);

		sof_ipc4_put_queue_id(src_widget, sroute->src_queue_id,

				      SOF_PIN_TYPE_SOURCE);

		return sroute->dst_queue_id;

	}



	dev_dbg(sdev->dev, "bind %s:%d -> %s:%d\n",

		src_widget->widget->name, sroute->src_queue_id,

		sink_widget->widget->name, sroute->dst_queue_id);



	header = src_fw_module->man4_module_entry.id;

	header |= SOF_IPC4_MOD_INSTANCE(src_widget->instance_id);
@@ -1600,17 +1699,23 @@ static int sof_ipc4_route_setup(struct snd_sof_dev *sdev, struct snd_sof_route * 


	extension = sink_fw_module->man4_module_entry.id;

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_INSTANCE(sink_widget->instance_id);

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_QUEUE_ID(dst_queue);

	extension |= SOF_IPC4_MOD_EXT_SRC_MOD_QUEUE_ID(src_queue);

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_QUEUE_ID(sroute->dst_queue_id);

	extension |= SOF_IPC4_MOD_EXT_SRC_MOD_QUEUE_ID(sroute->src_queue_id);



	msg.primary = header;

	msg.extension = extension;



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

	if (ret < 0)

	if (ret < 0) {

		dev_err(sdev->dev, "%s: failed to bind modules %s -> %s\n",

			__func__, src_widget->widget->name, sink_widget->widget->name);



		sof_ipc4_put_queue_id(src_widget, sroute->src_queue_id,

				      SOF_PIN_TYPE_SOURCE);

		sof_ipc4_put_queue_id(sink_widget, sroute->dst_queue_id,

				      SOF_PIN_TYPE_SINK);

	}



	return ret;

}
@@ -1622,12 +1727,11 @@ static int sof_ipc4_route_free(struct snd_sof_dev *sdev, struct snd_sof_route *s 
	struct sof_ipc4_fw_module *sink_fw_module = sink_widget->module_info;

	struct sof_ipc4_msg msg = {{ 0 }};

	u32 header, extension;

	int src_queue = 0;

	int dst_queue = 0;

	int ret;



	dev_dbg(sdev->dev, "unbind modules %s -> %s\n",

		src_widget->widget->name, sink_widget->widget->name);

	dev_dbg(sdev->dev, "unbind modules %s:%d -> %s:%d\n",

		src_widget->widget->name, sroute->src_queue_id,

		sink_widget->widget->name, sroute->dst_queue_id);



	header = src_fw_module->man4_module_entry.id;

	header |= SOF_IPC4_MOD_INSTANCE(src_widget->instance_id);
@@ -1637,8 +1741,8 @@ static int sof_ipc4_route_free(struct snd_sof_dev *sdev, struct snd_sof_route *s 


	extension = sink_fw_module->man4_module_entry.id;

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_INSTANCE(sink_widget->instance_id);

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_QUEUE_ID(dst_queue);

	extension |= SOF_IPC4_MOD_EXT_SRC_MOD_QUEUE_ID(src_queue);

	extension |= SOF_IPC4_MOD_EXT_DST_MOD_QUEUE_ID(sroute->dst_queue_id);

	extension |= SOF_IPC4_MOD_EXT_SRC_MOD_QUEUE_ID(sroute->src_queue_id);



	msg.primary = header;

	msg.extension = extension;
@@ -1648,6 +1752,9 @@ static int sof_ipc4_route_free(struct snd_sof_dev *sdev, struct snd_sof_route *s 
		dev_err(sdev->dev, "failed to unbind modules %s -> %s\n",

			src_widget->widget->name, sink_widget->widget->name);



	sof_ipc4_put_queue_id(sink_widget, sroute->dst_queue_id, SOF_PIN_TYPE_SINK);

	sof_ipc4_put_queue_id(src_widget, sroute->src_queue_id, SOF_PIN_TYPE_SOURCE);



	return ret;

}

sound/soc/sof/sof-audio.h

+6 −0
Original line number Diff line number Diff line
@@ -422,6 +422,9 @@ struct snd_sof_widget { 
	char **sink_pin_binding;

	char **src_pin_binding;



	struct ida src_queue_ida;

	struct ida sink_queue_ida;



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

};
@@ -435,6 +438,9 @@ struct snd_sof_route { 
	struct snd_sof_widget *sink_widget;

	bool setup;



	int src_queue_id;

	int dst_queue_id;



	void *private;

};

sound/soc/sof/topology.c

+5 −0
Original line number Diff line number Diff line
@@ -1392,6 +1392,8 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, 
	swidget->id = w->id;

	swidget->pipeline_id = index;

	swidget->private = NULL;

	ida_init(&swidget->src_queue_ida);

	ida_init(&swidget->sink_queue_ida);



	ret = sof_parse_tokens(scomp, swidget, comp_pin_tokens,

			       ARRAY_SIZE(comp_pin_tokens), priv->array,
@@ -1624,6 +1626,9 @@ static int sof_widget_unload(struct snd_soc_component *scomp, 
	if (widget_ops[swidget->id].ipc_free)

		widget_ops[swidget->id].ipc_free(swidget);



	ida_destroy(&swidget->src_queue_ida);

	ida_destroy(&swidget->sink_queue_ida);



	sof_free_pin_binding(swidget, SOF_PIN_TYPE_SINK);

	sof_free_pin_binding(swidget, SOF_PIN_TYPE_SOURCE);