component: module_adapter: Update struct ipc4_module_init_ext_obj_dp_data

Update struct ipc4_module_init_ext_obj_dp_data to match what is required
for latest user space features.

This is a tricky change as it chenges already part of ABI. However, as
the structure was not really used for anything before, changing it
should be safe. That is with one exception. The case where an earlier
SOF driver sends us the old smaller struct identifier with
IPC4_MOD_INIT_DATA_ID_DP_DATA, then we should not fail on that, but
only ignore the struct. This is why "return" is changed to "break"
in case IPC4_MOD_INIT_DATA_ID_DP_DATA.

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

Author: Jyri Sarha

src/audio/module_adapter/module_adapter_ipc4.c

@@ -67,15 +67,20 @@ module_ext_init_decode(struct comp_dev *dev, struct module_config *dst,
 				(const struct ipc4_module_init_ext_obj_dp_data *)(obj + 1);
 
 			if (obj->object_words * sizeof(uint32_t) < sizeof(*dp_data)) {
-				comp_err(dev, "dp_data object too small %zu < %zu",
-					 obj->object_words * sizeof(uint32_t), sizeof(*dp_data));
-				return NULL;
+				comp_warn(dev, "dp_data object too small %zu < %zu",
+					  obj->object_words * sizeof(uint32_t), sizeof(*dp_data));
+				break;
 			}
 			dst->domain_id = dp_data->domain_id;
 			dst->stack_bytes = dp_data->stack_bytes;
-			dst->heap_bytes = dp_data->heap_bytes;
-			comp_info(dev, "init_ext_obj_dp_data domain %u stack %u heap %u",
-				  dp_data->domain_id, dp_data->stack_bytes, dp_data->heap_bytes);
+			dst->interim_heap_bytes = dp_data->interim_heap_bytes;
+			dst->lifetime_heap_bytes = dp_data->interim_heap_bytes;
+			dst->shared_bytes = dp_data->shared_bytes;
+			comp_info(dev,
+				  "init_ext_obj_dp_data domain %u stack %u interim %u lifetime %u shared %u",
+				  dp_data->domain_id, dp_data->stack_bytes,
+				  dp_data->interim_heap_bytes, dp_data->lifetime_heap_bytes,
+				  dp_data->shared_bytes);
 			break;
 		}
 		default:

src/include/ipc4/module.h

@@ -90,9 +90,11 @@ struct ipc4_module_init_ext_object {
 
 /* Ext init array data object for Data Processing module memory requirements */
 struct ipc4_module_init_ext_obj_dp_data {
-	uint32_t domain_id;	/* userspace domain ID */
-	uint32_t stack_bytes;	/* required stack size in bytes, 0 means default size */
-	uint32_t heap_bytes;	/* required heap size in bytes, 0 means default size */
+	uint32_t domain_id;		/* userspace domain ID */
+	uint32_t stack_bytes;		/* required stack size in bytes */
+	uint32_t interim_heap_bytes;	/* required interim heap size in bytes */
+	uint32_t lifetime_heap_bytes;	/* required lifetime heap size in bytes */
+	uint32_t shared_bytes;		/* required shared memory size in bytes */
 } __attribute__((packed, aligned(4)));
 
 /*

src/include/module/module/base.h

@@ -38,9 +38,11 @@ struct module_config {
 	uint8_t nb_output_pins;
 	struct ipc4_input_pin_format *input_pins;
 	struct ipc4_output_pin_format *output_pins;
-	uint32_t domain_id;	/* userspace domain ID */
-	uint32_t stack_bytes;	/* stack size in bytes, 0 means default value */
-	uint32_t heap_bytes;	/* max heap size in bytes, 0 means default value */
+	uint32_t domain_id;		/* userspace domain ID */
+	uint32_t stack_bytes;		/* stack size in bytes */
+	uint32_t interim_heap_bytes;	/* interim heap size in bytes */
+	uint32_t lifetime_heap_bytes;	/* lifetime heap size in bytes */
+	uint32_t shared_bytes;		/* shared size in bytes */
 #endif
 };