Unverified Commit 8f464a41 authored by Baofeng Tian's avatar Baofeng Tian Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Add module ID print during module set up 



This module ID will be used for module performance automatic analysis
for different modules, module name, module ID and module instance ID
will be combined as a new generated ID for current module, this ID
will be further used by analysis tools to identify current module.

Take below case as example:
0x030006 gain.11.1
3 is module instance ID, 6 is module ID and gain.11.1 is module name.

For pipeline widget print, keep as it is.

Signed-off-by: default avatarBaofeng Tian <baofeng.tian@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarChao Song <chao.song@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231129122234.14515-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/ipc4-topology.c

+10 −2
Original line number Diff line number Diff line
@@ -2383,6 +2383,8 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget 
	}



	if (swidget->id != snd_soc_dapm_scheduler) {

		int module_id = msg->primary & SOF_IPC4_MOD_ID_MASK;



		ret = sof_ipc4_widget_assign_instance_id(sdev, swidget);

		if (ret < 0) {

			dev_err(sdev->dev, "failed to assign instance id for %s\n",
@@ -2398,9 +2400,15 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget 


		msg->extension &= ~SOF_IPC4_MOD_EXT_PPL_ID_MASK;

		msg->extension |= SOF_IPC4_MOD_EXT_PPL_ID(pipe_widget->instance_id);



		dev_dbg(sdev->dev, "Create widget %s (pipe %d) - ID %d, instance %d, core %d\n",

			swidget->widget->name, swidget->pipeline_id, module_id,

			swidget->instance_id, swidget->core);

	} else {

		dev_dbg(sdev->dev, "Create pipeline %s (pipe %d) - instance %d, core %d\n",

			swidget->widget->name, swidget->pipeline_id,

			swidget->instance_id, swidget->core);

	}

	dev_dbg(sdev->dev, "Create widget %s instance %d - pipe %d - core %d\n",

		swidget->widget->name, swidget->instance_id, swidget->pipeline_id, swidget->core);



	msg->data_size = ipc_size;

	msg->data_ptr = ipc_data;