Skip to content

Commit 617f177

Browse files
author
Jyri Sarha
committed
ASoC: SOF: ipc4-topology: Remove dp_ from all module memory attributes
Remove dp-prefix from all module instance's memory attributes and related data structures. The attributes are not to be used exclusively for Data Processing module instances. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
1 parent 34b2c69 commit 617f177

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎include/sound/sof/ipc4/header.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,12 +680,12 @@ struct sof_ipc4_module_init_ext_object {
680680

681681
enum sof_ipc4_mod_init_ext_obj_id {
682682
SOF_IPC4_MOD_INIT_DATA_ID_INVALID = 0,
683-
SOF_IPC4_MOD_INIT_DATA_ID_DP_DATA,
684-
SOF_IPC4_MOD_INIT_DATA_ID_MAX = SOF_IPC4_MOD_INIT_DATA_ID_DP_DATA,
683+
SOF_IPC4_MOD_INIT_DATA_ID_MEM_DATA,
684+
SOF_IPC4_MOD_INIT_DATA_ID_MAX = SOF_IPC4_MOD_INIT_DATA_ID_MEM_DATA,
685685
};
686686

687687
/* DP module memory configuration data object for ext_init object array */
688-
struct sof_ipc4_mod_init_ext_dp_memory_data {
688+
struct sof_ipc4_mod_init_ext_memory_data {
689689
u32 domain_id; /* userspace domain ID */
690690
u32 stack_bytes; /* stack size in bytes, 0 means default size */
691691
u32 heap_bytes; /* stack size in bytes, 0 means default size */

‎sound/soc/sof/ipc4-topology.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ static const struct sof_topology_token comp_ext_tokens[] = {
159159
{SOF_TKN_COMP_SCHED_DOMAIN, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_comp_domain,
160160
offsetof(struct snd_sof_widget, comp_domain)},
161161
{SOF_TKN_COMP_DOMAIN_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
162-
offsetof(struct snd_sof_widget, dp_domain_id)},
162+
offsetof(struct snd_sof_widget, domain_id)},
163163
{SOF_TKN_COMP_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
164-
offsetof(struct snd_sof_widget, dp_heap_bytes)},
164+
offsetof(struct snd_sof_widget, heap_bytes)},
165165
{SOF_TKN_COMP_STACK_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
166-
offsetof(struct snd_sof_widget, dp_stack_bytes)},
166+
offsetof(struct snd_sof_widget, stack_bytes)},
167167
};
168168

169169
static const struct sof_topology_token gain_tokens[] = {
@@ -2957,7 +2957,7 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev,
29572957
void *ipc_data, u32 ipc_size,
29582958
void **new_data)
29592959
{
2960-
struct sof_ipc4_mod_init_ext_dp_memory_data *dp_mem_data;
2960+
struct sof_ipc4_mod_init_ext_memory_data *mem_data;
29612961
struct sof_ipc4_module_init_ext_init *ext_init;
29622962
struct sof_ipc4_module_init_ext_object *hdr;
29632963
int new_size;
@@ -2984,19 +2984,19 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev,
29842984

29852985
/* Add object array objects after ext_init */
29862986

2987-
/* Add dp_memory_data if comp_domain indicates DP */
2987+
/* Add memory_data if comp_domain indicates DP */
29882988
if (swidget->comp_domain == SOF_COMP_DOMAIN_DP) {
29892989
hdr = (struct sof_ipc4_module_init_ext_object *)&payload[ext_pos];
29902990
hdr->header = SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK |
2991-
SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_DP_DATA) |
2992-
SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*dp_mem_data),
2991+
SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_MEM_DATA) |
2992+
SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*mem_data),
29932993
sizeof(u32)));
29942994
ext_pos += DIV_ROUND_UP(sizeof(*hdr), sizeof(u32));
2995-
dp_mem_data = (struct sof_ipc4_mod_init_ext_dp_memory_data *)&payload[ext_pos];
2996-
dp_mem_data->domain_id = swidget->dp_domain_id;
2997-
dp_mem_data->stack_bytes = swidget->dp_stack_bytes;
2998-
dp_mem_data->heap_bytes = swidget->dp_heap_bytes;
2999-
ext_pos += DIV_ROUND_UP(sizeof(*dp_mem_data), sizeof(u32));
2995+
mem_data = (struct sof_ipc4_mod_init_ext_memory_data *)&payload[ext_pos];
2996+
mem_data->domain_id = swidget->domain_id;
2997+
mem_data->stack_bytes = swidget->stack_bytes;
2998+
mem_data->heap_bytes = swidget->heap_bytes;
2999+
ext_pos += DIV_ROUND_UP(sizeof(*mem_data), sizeof(u32));
30003000
}
30013001

30023002
/* If another array object is added, remember clear previous OBJ_LAST bit */

‎sound/soc/sof/sof-audio.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,10 +459,10 @@ struct snd_sof_widget {
459459
/* Scheduling domain (enum sof_comp_domain), unset, Low Latency, or Data Processing */
460460
u32 comp_domain;
461461

462-
/* The values below are added to mod_init pay load if comp_domain indicates DP component */
463-
u32 dp_domain_id; /* DP process userspace domain ID */
464-
u32 dp_stack_bytes; /* DP process stack size requirement in bytes */
465-
u32 dp_heap_bytes; /* DP process heap size requirement in bytes */
462+
/* Module instance's memory configureation. */
463+
u32 domain_id; /* Module instance's userspace domain ID */
464+
u32 stack_bytes; /* Module instance's stack size requirement */
465+
u32 heap_bytes; /* Module instance's heap size requirement */
466466

467467
struct snd_soc_dapm_widget *widget;
468468
struct list_head list; /* list in sdev widget list */

0 commit comments

Comments
 (0)