ipc4: Replace interim_heap_bytes and lifetime_heap_bytes with heap_bytes

Jyri Sarha · Jyri Sarha · commit c00d82ce567e · 2026-06-03T23:04:18.000+03:00
Simplify the IPC4 memory data structs by replacing separate
interim_heap_bytes, lifetime_heap_bytes, and shared_bytes fields with a
single heap_bytes field, matching the Linux driver side changes.

Affects both ipc4_module_init_ext_obj_dp_data and
ipc4_pipeline_ext_obj_mem_data structs, and their corresponding log
messages.

Signed-off-by: Jyri Sarha &lt;jyri.sarha@linux.intel.com&gt;
diff --git a/src/audio/module_adapter/module_adapter_ipc4.c b/src/audio/module_adapter/module_adapter_ipc4.c
@@ -81,10 +81,9 @@ int module_ext_init_decode(const struct comp_driver *drv, struct module_ext_init
 			}
 			ext_data->dp_data = dp_data;
 			comp_cl_info(drv,
-				     "init_ext_obj_dp_data domain %u stack %u interim %u lifetime %u shared %u",
+				     "init_ext_obj_dp_data domain %u stack %u heap %u",
 				     dp_data->domain_id, dp_data->stack_bytes,
-				     dp_data->interim_heap_bytes, dp_data->lifetime_heap_bytes,
-				     dp_data->shared_bytes);
+				     dp_data->heap_bytes);
 			break;
 		}
 		case IPC4_MOD_INIT_DATA_ID_MODULE_DATA:
diff --git a/src/include/ipc4/module.h b/src/include/ipc4/module.h
@@ -93,9 +93,7 @@ struct ipc4_module_init_ext_object {
 struct ipc4_module_init_ext_obj_dp_data {
 	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 */
+	uint32_t heap_bytes;			/* required heap size in bytes */
 } __attribute__((packed, aligned(4)));
 
 /*
diff --git a/src/include/ipc4/pipeline.h b/src/include/ipc4/pipeline.h
@@ -88,9 +88,7 @@ struct ipc4_pipeline_ext_object {
 struct ipc4_pipeline_ext_obj_mem_data {
 	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 in bytes */
+	uint32_t heap_bytes;			/* required heap size in bytes */
 } __packed __aligned(4);
 
 /*
diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c
@@ -317,10 +317,9 @@ __cold static int ipc4_create_pipeline_payload_decode(char *data,
 			}
 			pparams->mem_data = mem_data;
 			tr_info(&ipc_tr,
-				"init_ext_obj_mem_data domain %u stack %u interim %u lifetime %u shared %u",
+				"init_ext_obj_mem_data domain %u stack %u heap %u",
 				mem_data->domain_id, mem_data->stack_bytes,
-				mem_data->interim_heap_bytes, mem_data->lifetime_heap_bytes,
-				mem_data->shared_bytes);
+				mem_data->heap_bytes);
 			break;
 		}
 		default:

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,9 @@ int module_ext_init_decode(const struct comp_driver *drv, struct module_ext_init`
`81`	`81`	`}`
`82`	`82`	`ext_data->dp_data = dp_data;`
`83`	`83`	`comp_cl_info(drv,`
`84`		`- "init_ext_obj_dp_data domain %u stack %u interim %u lifetime %u shared %u",`
	`84`	`+ "init_ext_obj_dp_data domain %u stack %u heap %u",`
`85`	`85`	`dp_data->domain_id, dp_data->stack_bytes,`
`86`		`- dp_data->interim_heap_bytes, dp_data->lifetime_heap_bytes,`
`87`		`- dp_data->shared_bytes);`
	`86`	`+ dp_data->heap_bytes);`
`88`	`87`	`break;`
`89`	`88`	`}`
`90`	`89`	`case IPC4_MOD_INIT_DATA_ID_MODULE_DATA:`
Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,9 @@ __cold static int ipc4_create_pipeline_payload_decode(char *data,`
`317`	`317`	`}`
`318`	`318`	`pparams->mem_data = mem_data;`
`319`	`319`	`tr_info(&ipc_tr,`
`320`		`- "init_ext_obj_mem_data domain %u stack %u interim %u lifetime %u shared %u",`
	`320`	`+ "init_ext_obj_mem_data domain %u stack %u heap %u",`
`321`	`321`	`mem_data->domain_id, mem_data->stack_bytes,`
`322`		`- mem_data->interim_heap_bytes, mem_data->lifetime_heap_bytes,`
`323`		`- mem_data->shared_bytes);`
	`322`	`+ mem_data->heap_bytes);`
`324`	`323`	`break;`
`325`	`324`	`}`
`326`	`325`	`default:`