github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: ipc4-topology: Support init_ext_module_data for process modules

Browse Source 
Add support for handling init_ext_module_data for process modules, which is
going to be used by decoder and encoder type of process modules.
The support is generic and it can be extended to other type of process
modules or other module types than process with a small update of
sof_ipc4_add_init_ext_module_data() function.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Link: https://patch.msgid.link/20261007084955.1256-18-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2026-10-07 11:49:44 +03:00 committed by Mark Brown
parent b7822e6cf3
commit 73df6ceb83
3 changed files with 71 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
sound/soc/sof/ipc4-topology.c
View File

@ -3263,22 +3263,56 @@ static void sof_ipc4_add_init_ext_dp_memory_data(struct snd_sof_dev *sdev,
u32 *payload, u32 *ext_pos,
struct sof_ipc4_module_init_ext_object **hdr)
{
/* Add memory_data if comp_domain indicates DP */
if (swidget->comp_domain == SOF_COMP_DOMAIN_DP) {
struct sof_ipc4_mod_init_ext_dp_memory_data *dp_mem_data;
struct sof_ipc4_mod_init_ext_dp_memory_data *dp_mem_data;
*hdr = (struct sof_ipc4_module_init_ext_object *)&payload[*ext_pos];
(*hdr)->header =
SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_DP_DATA) |
SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*dp_mem_data),
sizeof(u32)));
*ext_pos += DIV_ROUND_UP(sizeof(**hdr), sizeof(u32));
dp_mem_data = (struct sof_ipc4_mod_init_ext_dp_memory_data *)&payload[*ext_pos];
dp_mem_data->domain_id = swidget->domain_id;
dp_mem_data->stack_bytes = swidget->stack_bytes;
dp_mem_data->heap_bytes = swidget->heap_bytes;
*ext_pos += DIV_ROUND_UP(sizeof(*dp_mem_data), sizeof(u32));
*hdr = (struct sof_ipc4_module_init_ext_object *)&payload[*ext_pos];
(*hdr)->header =
SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_DP_DATA) |
SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(sizeof(*dp_mem_data),
sizeof(u32)));
*ext_pos += DIV_ROUND_UP(sizeof(**hdr), sizeof(u32));
dp_mem_data = (struct sof_ipc4_mod_init_ext_dp_memory_data *)&payload[*ext_pos];
dp_mem_data->domain_id = swidget->domain_id;
dp_mem_data->stack_bytes = swidget->stack_bytes;
dp_mem_data->heap_bytes = swidget->heap_bytes;
*ext_pos += DIV_ROUND_UP(sizeof(*dp_mem_data), sizeof(u32));
}
static int
sof_ipc4_add_init_ext_module_data(struct snd_sof_dev *sdev,
struct sof_ipc4_process *process,
u32 *payload, u32 *ext_pos,
struct sof_ipc4_module_init_ext_object **hdr)
{
u32 data_size = process->init_ext_module_size;
void *data = process->init_ext_module_data;
size_t needed;
/*
* Unlike the other objects, the module data is of variable size,
* provided by the module which is being set up.
* Make sure that the object fits into the payload buffer before any of
* it is written.
*/
needed = ((size_t)*ext_pos + DIV_ROUND_UP(sizeof(**hdr), sizeof(u32)) +
DIV_ROUND_UP(data_size, sizeof(u32))) * sizeof(u32);
if (needed > sdev->ipc->max_payload_size) {
dev_err(sdev->dev,
"Max ipc payload size %zu exceeded by module data: %zu\n",
sdev->ipc->max_payload_size, needed);
return -EINVAL;
}
*hdr = (struct sof_ipc4_module_init_ext_object *)&payload[*ext_pos];
(*hdr)->header = SOF_IPC4_MOD_INIT_EXT_OBJ_ID(SOF_IPC4_MOD_INIT_DATA_ID_MODULE_DATA) |
SOF_IPC4_MOD_INIT_EXT_OBJ_WORDS(DIV_ROUND_UP(data_size, sizeof(u32)));
*ext_pos += DIV_ROUND_UP(sizeof(*(*hdr)), sizeof(u32));
memcpy(&payload[*ext_pos], data, data_size);
*ext_pos += DIV_ROUND_UP(data_size, sizeof(u32));
return 0;
}
static int sof_ipc4_widget_mod_init_msg_payload(struct snd_sof_dev *sdev,
@ -3287,17 +3321,17 @@ static int sof_ipc4_widget_mod_init_msg_payload(struct snd_sof_dev *sdev,
void *ipc_data, u32 ipc_size,
void **new_data)
{
struct sof_ipc4_module_init_ext_init *ext_init;
struct sof_ipc4_process *process = swidget->private;
struct sof_ipc4_module_init_ext_object *hdr = NULL;
struct sof_ipc4_module_init_ext_init *ext_init;
bool in_dp_domain = swidget->comp_domain == SOF_COMP_DOMAIN_DP;
bool has_ext_data = WIDGET_IS_PROCESS(swidget->id) && process->init_ext_module_size;
int new_size;
u32 *payload;
u32 ext_pos;
int ret;
/*
* Only DP widgets currently add init-ext objects here. Avoid allocating
* a max-sized payload buffer for widgets that will immediately return 0.
*/
if (swidget->comp_domain != SOF_COMP_DOMAIN_DP)
if (!in_dp_domain && !has_ext_data)
return 0;
payload = kzalloc(sdev->ipc->max_payload_size, GFP_KERNEL);
@ -3306,25 +3340,24 @@ static int sof_ipc4_widget_mod_init_msg_payload(struct snd_sof_dev *sdev,
/* Add ext_init first and set objects array flag to 1 */
ext_init = (struct sof_ipc4_module_init_ext_init *)payload;
ext_init->word0 |= SOF_IPC4_MOD_INIT_EXT_OBJ_ARRAY_MASK;
ext_pos = DIV_ROUND_UP(sizeof(*ext_init), sizeof(u32));
/* Add object array objects after ext_init */
if (in_dp_domain)
sof_ipc4_add_init_ext_dp_memory_data(sdev, swidget, payload,
&ext_pos, &hdr);
sof_ipc4_add_init_ext_dp_memory_data(sdev, swidget, payload, &ext_pos, &hdr);
/* Add following object array items here */
if (!hdr) {
/*
* NOTE: Remove this early bail out, when struct
* sof_ipc4_module_init_ext_init alone has some
* function.
*/
kfree(payload);
return 0;
if (has_ext_data) {
ret = sof_ipc4_add_init_ext_module_data(sdev, process, payload,
&ext_pos, &hdr);
if (ret) {
kfree(payload);
return ret;
}
}
ext_init->word0 |= SOF_IPC4_MOD_INIT_EXT_OBJ_ARRAY_MASK;
/* Set last bit for the last object in the array */
hdr->header |= SOF_IPC4_MOD_INIT_EXT_OBJ_LAST_MASK;
/* Calculate final size and check that it fits to max payload size */

4
sound/soc/sof/ipc4-topology.h
View File

@ -524,6 +524,8 @@ struct sof_ipc4_base_module_cfg_ext {
* @msg: IPC4 message struct containing header and data info
* @base_config_ext_size: Size of the base config extension data in bytes
* @init_config: Module init config type (SOF_IPC4_MODULE_INIT_CONFIG_TYPE_*)
* @init_ext_module_data: module_data for init_ext object
* @init_ext_module_size: size of init_ext_module_data
*/
struct sof_ipc4_process {
struct sof_ipc4_base_module_cfg base_config;
@ -535,6 +537,8 @@ struct sof_ipc4_process {
struct sof_ipc4_msg msg;
u32 base_config_ext_size;
u32 init_config;
void *init_ext_module_data;
size_t init_ext_module_size;
};
bool sof_ipc4_copier_is_single_bitdepth(struct snd_sof_dev *sdev,

1
sound/soc/sof/sof-audio.h
View File

@ -43,6 +43,7 @@
#define WIDGET_IS_AIF(id) ((id) == snd_soc_dapm_aif_in || (id) == snd_soc_dapm_aif_out)
#define WIDGET_IS_AIF_OR_DAI(id) (WIDGET_IS_DAI(id) || WIDGET_IS_AIF(id))
#define WIDGET_IS_COPIER(id) (WIDGET_IS_AIF_OR_DAI(id) || (id) == snd_soc_dapm_buffer)
#define WIDGET_IS_PROCESS(id) ((id) == snd_soc_dapm_effect)
#define SOF_DAI_PARAM_INTEL_SSP_MCLK 0
#define SOF_DAI_PARAM_INTEL_SSP_BCLK 1