Skip to content

Commit 456d2cf

Browse files
author
Jyri Sarha
committed
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 <jyri.sarha@linux.intel.com>
1 parent f64beff commit 456d2cf

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,14 @@ static const struct sof_topology_token comp_ext_tokens[] = {
164164
offsetof(struct snd_sof_widget, comp_domain)},
165165
{SOF_TKN_COMP_DOMAIN_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
166166
offsetof(struct snd_sof_widget, domain_id)},
167-
{SOF_TKN_COMP_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
168-
offsetof(struct snd_sof_widget, heap_bytes)},
169167
{SOF_TKN_COMP_STACK_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
170168
offsetof(struct snd_sof_widget, stack_bytes)},
169+
{SOF_TKN_COMP_INTERIM_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
170+
offsetof(struct snd_sof_widget, interim_bytes)},
171+
{SOF_TKN_COMP_LIFETIME_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
172+
offsetof(struct snd_sof_widget, lifetime_bytes)},
173+
{SOF_TKN_COMP_SHARED_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
174+
offsetof(struct snd_sof_widget, shared_bytes)},
171175
};
172176

173177
static const struct sof_topology_token gain_tokens[] = {

sound/soc/sof/sof-audio.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@ struct snd_sof_widget {
462462
/* Module instance's memory configureation. */
463463
u32 domain_id; /* Module instance's userspace domain ID */
464464
u32 stack_bytes; /* Module instance's stack size requirement */
465-
u32 heap_bytes; /* Module instance's heap size requirement */
465+
u32 interim_bytes; /* Module instance's interim heap size requirement */
466+
u32 lifetime_bytes; /* Module instance's lifetime heap requirement */
467+
u32 shared_bytes; /* Module instance's shared memory requirement */
466468

467469
struct snd_soc_dapm_widget *widget;
468470
struct list_head list; /* list in sdev widget list */

0 commit comments

Comments
 (0)