Remove dp-prefix from all module instance's memory attributes and related data structures. The attributes are not anymore exclusively for Data Processing module instances, but generic for all module instances. However, the module init payload is still only for DP module instances.
Unified · Split
| @@ -163,11 +163,11 @@ static const struct sof_topology_token comp_ext_tokens[] = { · 162 unmodified lines | |||
| 163 | {SOF_TKN_COMP_SCHED_DOMAIN, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_comp_domain, | 163 | {SOF_TKN_COMP_SCHED_DOMAIN, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_comp_domain, |
| 164 | offsetof(struct snd_sof_widget, comp_domain)}, | 164 | offsetof(struct snd_sof_widget, comp_domain)}, |
| 165 | {SOF_TKN_COMP_DOMAIN_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, | 165 | {SOF_TKN_COMP_DOMAIN_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, |
| 166 | offsetof(struct snd_sof_widget, dp_domain_id)}, | 166 | offsetof(struct snd_sof_widget, domain_id)}, |
| 167 | {SOF_TKN_COMP_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, | 167 | {SOF_TKN_COMP_HEAP_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, |
| 168 | offsetof(struct snd_sof_widget, dp_heap_bytes)}, | 168 | offsetof(struct snd_sof_widget, heap_bytes)}, |
| 169 | {SOF_TKN_COMP_STACK_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, | 169 | {SOF_TKN_COMP_STACK_BYTES_REQUIREMENT, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32, |
| 170 | offsetof(struct snd_sof_widget, dp_stack_bytes)}, | 170 | offsetof(struct snd_sof_widget, stack_bytes)}, |
| 171 | }; | 171 | }; |
| 172 | 172 | ||
| 173 | static const struct sof_topology_token gain_tokens[] = { | 173 | static const struct sof_topology_token gain_tokens[] = { |
| @@ -3118,7 +3118,7 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev, · 2944 unmodified lines | |||
| 3118 | 3118 | ||
| 3119 | /* Add object array objects after ext_init */ | 3119 | /* Add object array objects after ext_init */ |
| 3120 | 3120 | ||
| 3121 | /* Add dp_memory_data if comp_domain indicates DP */ | 3121 | /* Add memory_data if comp_domain indicates DP */ |
| 3122 | if (swidget->comp_domain == SOF_COMP_DOMAIN_DP) { | 3122 | if (swidget->comp_domain == SOF_COMP_DOMAIN_DP) { |
| 3123 | hdr = (struct sof_ipc4_module_init_ext_object *)&payload[ext_pos]; | 3123 | hdr = (struct sof_ipc4_module_init_ext_object *)&payload[ext_pos]; |
| 3124 | hdr->header = SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK | | 3124 | hdr->header = SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK | |
| @@ -3127,9 +3127,9 @@ static int sof_ipc4_widget_setup_msg_payload(struct snd_sof_dev *sdev, · 2 unmodified lines | |||
| 3127 | sizeof(u32))); | 3127 | sizeof(u32))); |
| 3128 | ext_pos += DIV_ROUND_UP(sizeof(*hdr), sizeof(u32)); | 3128 | ext_pos += DIV_ROUND_UP(sizeof(*hdr), sizeof(u32)); |
| 3129 | dp_mem_data = (struct sof_ipc4_mod_init_ext_dp_memory_data *)&payload[ext_pos]; | 3129 | dp_mem_data = (struct sof_ipc4_mod_init_ext_dp_memory_data *)&payload[ext_pos]; |
| 3130 | dp_mem_data->domain_id = swidget->dp_domain_id; | 3130 | dp_mem_data->domain_id = swidget->domain_id; |
| 3131 | dp_mem_data->stack_bytes = swidget->dp_stack_bytes; | 3131 | dp_mem_data->stack_bytes = swidget->stack_bytes; |
| 3132 | dp_mem_data->heap_bytes = swidget->dp_heap_bytes; | 3132 | dp_mem_data->heap_bytes = swidget->heap_bytes; |
| 3133 | ext_pos += DIV_ROUND_UP(sizeof(*dp_mem_data), sizeof(u32)); | 3133 | ext_pos += DIV_ROUND_UP(sizeof(*dp_mem_data), sizeof(u32)); |
| 3134 | } | 3134 | } |
| 3135 | 3135 | ||
| @@ -459,10 +459,10 @@ struct snd_sof_widget { · 458 unmodified lines | |||
| 459 | /* Scheduling domain (enum sof_comp_domain), unset, Low Latency, or Data Processing */ | 459 | /* Scheduling domain (enum sof_comp_domain), unset, Low Latency, or Data Processing */ |
| 460 | u32 comp_domain; | 460 | u32 comp_domain; |
| 461 | 461 | ||
| 462 | /* The values below are added to mod_init pay load if comp_domain indicates DP component */ | 462 | /* Module instance's memory configuration. */ |
| 463 | u32 dp_domain_id; /* DP process userspace domain ID */ | 463 | u32 domain_id; /* Module instance's userspace domain ID */ |
| 464 | u32 dp_stack_bytes; /* DP process stack size requirement in bytes */ | 464 | u32 stack_bytes; /* Module instance's stack size requirement */ |
| 465 | u32 dp_heap_bytes; /* DP process heap size requirement in bytes */ | 465 | u32 heap_bytes; /* Module instance's heap size requirement */ |
| 466 | 466 | ||
| 467 | struct snd_soc_dapm_widget *widget; | 467 | struct snd_soc_dapm_widget *widget; |
| 468 | struct list_head list; /* list in sdev widget list */ | 468 | struct list_head list; /* list in sdev widget list */ |