ASoC: sof: Add lifetime_bytes and shared_bytes to snd_sof_widget

Add to lifetime_bytes and shared_bytes snd_sof_widget. They are with
SOF_TKN_COMP_LIFETIME_HEAP_BYTES_REQUIREMENT topology tokens and
SOF_TKN_COMP_SHARED_BYTES_REQUIREMENT topology token's values.

Also renames heap_bytes to interim_bytes to follow the term used in FW
side implementation.

Signed-off-by: Jyri Sarha <[email protected]>

Author: Jyri Sarha

sound/soc/sof/ipc4-topology.c

@@ -160,10 +160,14 @@ static const struct sof_topology_token comp_ext_tokens[] = {
 		offsetof(struct snd_sof_widget, comp_domain)},
 	{SOF_TKN_COMP_DOMAIN_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
 		offsetof(struct snd_sof_widget, domain_id)},
-	{SOF_TKN_COMP_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
-		offsetof(struct snd_sof_widget, heap_bytes)},
 	{SOF_TKN_COMP_STACK_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
 		offsetof(struct snd_sof_widget, stack_bytes)},
+	{SOF_TKN_COMP_INTERIM_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
+		offsetof(struct snd_sof_widget, interim_bytes)},
+	{SOF_TKN_COMP_LIFETIME_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
+		offsetof(struct snd_sof_widget, lifetime_bytes)},
+	{SOF_TKN_COMP_SHARED_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
+		offsetof(struct snd_sof_widget, shared_bytes)},
 };
 
 static const struct sof_topology_token gain_tokens[] = {

sound/soc/sof/sof-audio.h

@@ -462,7 +462,9 @@ struct snd_sof_widget {
 	/* Module instance's memory configureation. */
 	u32 domain_id;		/* Module instance's userspace domain ID */
 	u32 stack_bytes;	/* Module instance's stack size requirement */
-	u32 heap_bytes;		/* Module instance's heap size requirement */
+	u32 interim_bytes;	/* Module instance's interim heap size requirement */
+	u32 lifetime_bytes;	/* Module instance's lifetime heap requirement */
+	u32 shared_bytes;	/* Module instance's shared memory requirement */
 
 	struct snd_soc_dapm_widget *widget;
 	struct list_head list;	/* list in sdev widget list */