ASoC: SOF: ipc4-topology: Changes to mod init mem data message logic

Start adding struct sof_ipc4_mod_init_ext_memory_data payloads to all
setup messages and not only to Data Processing module instance setup
messages.

The idea is that all non DP module instances within the same pipeline
share the same memory attributes and access the same heap.

The new logic sums heap requirements together and picks the highest
stack requirement of all module instances belonging to a
pipeline. These pipeline specific attributes are sent as struct
sof_ipc4_mod_init_ext_memory_data payload in pipeline's setup message,
with the pipeline_id as the domain_id.

The non Data Processing module instance's setup messages also have
their struct sof_ipc4_mod_init_ext_memory_data payloads. In their
payload the domain_id is set to be same as their pipeline_id, and the
heap- and stack requirements are not set, as they were already sent
with the pipeline setup message.

The Data Processing module instances will also have their struct
sof_ipc4_mod_init_ext_memory_data payloads as before. In their payload
everything is as it was before, all attributes are copied directly
from their topology attributes.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

sound/soc/sof/ipc4-topology.c

@@ -1308,6 +1308,30 @@ sof_ipc4_update_resource_usage(struct snd_sof_dev *sdev, struct snd_sof_widget *
 	pipeline = pipe_widget->private;
 	pipeline->mem_usage += total;
 
+	/*
+	 * If this is not a Data Processing module instance, add the
+	 * required heap sizes to the sum of all modules instance's
+	 * belonging to same pipeline and find the maximun stack
+	 * requirement of all module instances belonging to the same
+	 * pipeline.
+	 */
+	if (swidget->comp_domain != SOF_COMP_DOMAIN_DP) {
+		pipe_widget->heap_bytes += swidget->heap_bytes;
+		if (pipe_widget->stack_bytes < swidget->stack_bytes)
+			pipe_widget->stack_bytes = swidget->stack_bytes;
+	}
+
+	/*
+	 * If this is not a Data Processing module instance the
+	 * pipeline_id should be used as domain_id.
+	 */
+	if (swidget->comp_domain != SOF_COMP_DOMAIN_DP) {
+		if (swidget->domain_id != 0)
+			dev_warn(sdev->dev, "%s is not DP, but domain_id %u was set in topology",
+				 swidget->widget->name, swidget->domain_id);
+		swidget->domain_id = swidget->pipeline_id;
+	}
+
 	/* Update base_config->cpc from the module manifest */
 	sof_ipc4_update_cpc_from_manifest(sdev, fw_module, base_config);
 
@@ -2964,15 +2988,6 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev,
 	u32 *payload;
 	u32 ext_pos;
 
-	/* For the moment the only reason for adding init_ext_init payload is DP
-	 * memory data. If both stack and heap size are 0 (= use default), then
-	 * there is no need for init_ext_init payload.
-	 */
-	if (swidget->comp_domain != SOF_COMP_DOMAIN_DP) {
-		msg->extension &= ~SOF_IPC4_MOD_EXT_EXTENDED_INIT_MASK;
-		return 0;
-	}
-
 	payload = kzalloc(sdev->ipc->max_payload_size, GFP_KERNEL);
 	if (!payload)
 		return -ENOMEM;
@@ -2984,20 +2999,26 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev,
 
 	/* Add object array objects after ext_init */
 
-	/* Add memory_data if comp_domain indicates DP */
-	if (swidget->comp_domain == SOF_COMP_DOMAIN_DP) {
-		hdr = (struct sof_ipc4_module_init_ext_object *)&payload[ext_pos];
-		hdr->header = SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK |
-			SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_MEM_DATA) |
-			SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*mem_data),
+	hdr = (struct sof_ipc4_module_init_ext_object *)&payload[ext_pos];
+	hdr->header = SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK |
+		SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_MEM_DATA) |
+		SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*mem_data),
 								     sizeof(u32)));
-		ext_pos += DIV_ROUND_UP(sizeof(*hdr), sizeof(u32));
-		mem_data = (struct sof_ipc4_mod_init_ext_memory_data *)&payload[ext_pos];
-		mem_data->domain_id = swidget->domain_id;
+	ext_pos += DIV_ROUND_UP(sizeof(*hdr), sizeof(u32));
+	mem_data = (struct sof_ipc4_mod_init_ext_memory_data *)&payload[ext_pos];
+	mem_data->domain_id = swidget->domain_id;
+	/*
+	 * Set stack- and heap sizes only if this is a pipeline widget
+	 * or if this is a Data Processing module instance. All Low
+	 * Latency module instances within same pipeline share the same
+	 * memory properties.
+	 */
+	if (swidget->comp_domain == SOF_COMP_DOMAIN_DP ||
+	    swidget->id == snd_soc_dapm_scheduler) {
 		mem_data->stack_bytes = swidget->stack_bytes;
 		mem_data->heap_bytes = swidget->heap_bytes;
-		ext_pos += DIV_ROUND_UP(sizeof(*mem_data), sizeof(u32));
 	}
+	ext_pos += DIV_ROUND_UP(sizeof(*mem_data), sizeof(u32));
 
 	/* If another array object is added, remember clear previous OBJ_LAST bit */
 
@@ -3188,6 +3209,16 @@ static int sof_ipc4_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget
 		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);
+
+		ret = sof_ipc4_widget_setup_msg_payload(sdev, swidget, msg, ipc_data, ipc_size,
+							&ext_data);
+		if (ret < 0)
+			goto fail;
+
+		if (ret > 0) {
+			ipc_size = ret;
+			ipc_data = ext_data;
+		}
 	}
 
 	msg->data_size = ipc_size;