mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ASoC: SOF: ipc4-topology: Add prepare op for AIF type widgets
Define the prepare op for the AIF type widgets for IPC4. The prepare op is responsible for choosing the input/output audio formats for these widgets based on the runtime PCM params, assigning the instance ID and updating the total memory usage for the pipelines these widgets belong to. Co-developed-by: Rander Wang <rander.wang@linux.intel.com> Signed-off-by: Rander Wang <rander.wang@linux.intel.com> Co-developed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20220609032643.916882-6-ranjani.sridharan@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
abfb536bd1
commit
904c48c40c
2 changed files with 306 additions and 2 deletions
|
@ -557,6 +557,290 @@ static int sof_ipc4_widget_setup_comp_pipeline(struct snd_sof_widget *swidget)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
sof_ipc4_update_pipeline_mem_usage(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,
|
||||
struct sof_ipc4_base_module_cfg *base_config)
|
||||
{
|
||||
struct sof_ipc4_fw_module *fw_module = swidget->module_info;
|
||||
struct snd_sof_widget *pipe_widget;
|
||||
struct sof_ipc4_pipeline *pipeline;
|
||||
int task_mem, queue_mem;
|
||||
int ibs, bss, total;
|
||||
|
||||
ibs = base_config->ibs;
|
||||
bss = base_config->is_pages;
|
||||
|
||||
task_mem = SOF_IPC4_PIPELINE_OBJECT_SIZE;
|
||||
task_mem += SOF_IPC4_MODULE_INSTANCE_LIST_ITEM_SIZE + bss;
|
||||
|
||||
if (fw_module->man4_module_entry.type & SOF_IPC4_MODULE_LL) {
|
||||
task_mem += SOF_IPC4_FW_ROUNDUP(SOF_IPC4_LL_TASK_OBJECT_SIZE);
|
||||
task_mem += SOF_IPC4_FW_MAX_QUEUE_COUNT * SOF_IPC4_MODULE_INSTANCE_LIST_ITEM_SIZE;
|
||||
task_mem += SOF_IPC4_LL_TASK_LIST_ITEM_SIZE;
|
||||
} else {
|
||||
task_mem += SOF_IPC4_FW_ROUNDUP(SOF_IPC4_DP_TASK_OBJECT_SIZE);
|
||||
task_mem += SOF_IPC4_DP_TASK_LIST_SIZE;
|
||||
}
|
||||
|
||||
ibs = SOF_IPC4_FW_ROUNDUP(ibs);
|
||||
queue_mem = SOF_IPC4_FW_MAX_QUEUE_COUNT * (SOF_IPC4_DATA_QUEUE_OBJECT_SIZE + ibs);
|
||||
|
||||
total = SOF_IPC4_FW_PAGE(task_mem + queue_mem);
|
||||
|
||||
pipe_widget = swidget->pipe_widget;
|
||||
pipeline = pipe_widget->private;
|
||||
pipeline->mem_usage += total;
|
||||
}
|
||||
|
||||
static int sof_ipc4_widget_assign_instance_id(struct snd_sof_dev *sdev,
|
||||
struct snd_sof_widget *swidget)
|
||||
{
|
||||
struct sof_ipc4_fw_module *fw_module = swidget->module_info;
|
||||
int max_instances = fw_module->man4_module_entry.instance_max_count;
|
||||
|
||||
swidget->instance_id = ida_alloc_max(&fw_module->m_ida, max_instances, GFP_KERNEL);
|
||||
if (swidget->instance_id < 0) {
|
||||
dev_err(sdev->dev, "failed to assign instance id for widget %s",
|
||||
swidget->widget->name);
|
||||
return swidget->instance_id;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
|
||||
struct snd_sof_widget *swidget,
|
||||
struct sof_ipc4_base_module_cfg *base_config,
|
||||
struct sof_ipc4_audio_format *out_format,
|
||||
struct snd_pcm_hw_params *params,
|
||||
struct sof_ipc4_available_audio_format *available_fmt,
|
||||
size_t object_offset)
|
||||
{
|
||||
void *ptr = available_fmt->ref_audio_fmt;
|
||||
u32 valid_bits;
|
||||
u32 channels;
|
||||
u32 rate;
|
||||
int sample_valid_bits;
|
||||
int i;
|
||||
|
||||
if (!ptr) {
|
||||
dev_err(sdev->dev, "no reference formats for %s\n", swidget->widget->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (params_format(params)) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
sample_valid_bits = 16;
|
||||
break;
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
sample_valid_bits = 24;
|
||||
break;
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
sample_valid_bits = 32;
|
||||
break;
|
||||
default:
|
||||
dev_err(sdev->dev, "invalid pcm frame format %d\n", params_format(params));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!available_fmt->audio_fmt_num) {
|
||||
dev_err(sdev->dev, "no formats available for %s\n", swidget->widget->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Search supported audio formats to match rate, channels ,and
|
||||
* sample_valid_bytes from runtime params
|
||||
*/
|
||||
for (i = 0; i < available_fmt->audio_fmt_num; i++, ptr = (u8 *)ptr + object_offset) {
|
||||
struct sof_ipc4_audio_format *fmt = ptr;
|
||||
|
||||
rate = fmt->sampling_frequency;
|
||||
channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
|
||||
valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
|
||||
if (params_rate(params) == rate && params_channels(params) == channels &&
|
||||
sample_valid_bits == valid_bits) {
|
||||
dev_dbg(sdev->dev, "%s: matching audio format index for %uHz, %ubit, %u channels: %d\n",
|
||||
__func__, rate, valid_bits, channels, i);
|
||||
|
||||
/* copy ibs/obs and input format */
|
||||
memcpy(base_config, &available_fmt->base_config[i],
|
||||
sizeof(struct sof_ipc4_base_module_cfg));
|
||||
|
||||
/* copy output format */
|
||||
if (out_format)
|
||||
memcpy(out_format, &available_fmt->out_audio_fmt[i],
|
||||
sizeof(struct sof_ipc4_audio_format));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == available_fmt->audio_fmt_num) {
|
||||
dev_err(sdev->dev, "%s: Unsupported audio format: %uHz, %ubit, %u channels\n",
|
||||
__func__, params_rate(params), sample_valid_bits, params_channels(params));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
dev_dbg(sdev->dev, "Init input audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(sdev->dev, &base_config->audio_fmt,
|
||||
sizeof(*base_config), 1);
|
||||
if (out_format) {
|
||||
dev_dbg(sdev->dev, "Init output audio formats for %s\n", swidget->widget->name);
|
||||
sof_ipc4_dbg_audio_format(sdev->dev, out_format,
|
||||
sizeof(*out_format), 1);
|
||||
}
|
||||
|
||||
/* Return the index of the matched format */
|
||||
return i;
|
||||
}
|
||||
|
||||
static void sof_ipc4_unprepare_copier_module(struct snd_sof_widget *swidget)
|
||||
{
|
||||
struct sof_ipc4_fw_module *fw_module = swidget->module_info;
|
||||
struct sof_ipc4_copier *ipc4_copier = NULL;
|
||||
struct snd_sof_widget *pipe_widget;
|
||||
struct sof_ipc4_pipeline *pipeline;
|
||||
|
||||
/* reset pipeline memory usage */
|
||||
pipe_widget = swidget->pipe_widget;
|
||||
pipeline = pipe_widget->private;
|
||||
pipeline->mem_usage = 0;
|
||||
|
||||
if (WIDGET_IS_AIF(swidget->id))
|
||||
ipc4_copier = swidget->private;
|
||||
|
||||
if (ipc4_copier) {
|
||||
kfree(ipc4_copier->ipc_config_data);
|
||||
ipc4_copier->ipc_config_data = NULL;
|
||||
ipc4_copier->ipc_config_size = 0;
|
||||
}
|
||||
|
||||
ida_free(&fw_module->m_ida, swidget->instance_id);
|
||||
}
|
||||
|
||||
static int
|
||||
sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
|
||||
struct snd_pcm_hw_params *fe_params,
|
||||
struct snd_sof_platform_stream_params *platform_params,
|
||||
struct snd_pcm_hw_params *pipeline_params, int dir)
|
||||
{
|
||||
struct sof_ipc4_available_audio_format *available_fmt;
|
||||
struct snd_soc_component *scomp = swidget->scomp;
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct sof_ipc4_copier_data *copier_data;
|
||||
struct snd_pcm_hw_params *ref_params;
|
||||
struct sof_ipc4_copier *ipc4_copier;
|
||||
struct snd_mask *fmt;
|
||||
int out_sample_valid_bits;
|
||||
size_t ref_audio_fmt_size;
|
||||
void **ipc_config_data;
|
||||
int *ipc_config_size;
|
||||
u32 **data;
|
||||
int ipc_size, ret;
|
||||
|
||||
dev_dbg(sdev->dev, "%s: copier %s, type %d", __func__, swidget->widget->name, swidget->id);
|
||||
|
||||
switch (swidget->id) {
|
||||
case snd_soc_dapm_aif_in:
|
||||
case snd_soc_dapm_aif_out:
|
||||
{
|
||||
struct sof_ipc4_gtw_attributes *gtw_attr;
|
||||
struct snd_sof_widget *pipe_widget;
|
||||
struct sof_ipc4_pipeline *pipeline;
|
||||
|
||||
pipe_widget = swidget->pipe_widget;
|
||||
pipeline = pipe_widget->private;
|
||||
ipc4_copier = (struct sof_ipc4_copier *)swidget->private;
|
||||
gtw_attr = ipc4_copier->gtw_attr;
|
||||
copier_data = &ipc4_copier->data;
|
||||
available_fmt = &ipc4_copier->available_fmt;
|
||||
|
||||
/*
|
||||
* base_config->audio_fmt and out_audio_fmt represent the input and output audio
|
||||
* formats. Use the input format as the reference to match pcm params for playback
|
||||
* and the output format as reference for capture.
|
||||
*/
|
||||
if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||
available_fmt->ref_audio_fmt = &available_fmt->base_config->audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_base_module_cfg);
|
||||
} else {
|
||||
available_fmt->ref_audio_fmt = available_fmt->out_audio_fmt;
|
||||
ref_audio_fmt_size = sizeof(struct sof_ipc4_audio_format);
|
||||
}
|
||||
copier_data->gtw_cfg.node_id &= ~SOF_IPC4_NODE_INDEX_MASK;
|
||||
copier_data->gtw_cfg.node_id |=
|
||||
SOF_IPC4_NODE_INDEX(platform_params->stream_tag - 1);
|
||||
|
||||
/* set gateway attributes */
|
||||
gtw_attr->lp_buffer_alloc = pipeline->lp_mode;
|
||||
ref_params = fe_params;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
dev_err(sdev->dev, "unsupported type %d for copier %s",
|
||||
swidget->id, swidget->widget->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* set input and output audio formats */
|
||||
ret = sof_ipc4_init_audio_fmt(sdev, swidget, &copier_data->base_config,
|
||||
&copier_data->out_format, ref_params,
|
||||
available_fmt, ref_audio_fmt_size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* modify the input params for the next widget */
|
||||
fmt = hw_param_mask(pipeline_params, SNDRV_PCM_HW_PARAM_FORMAT);
|
||||
out_sample_valid_bits =
|
||||
SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(copier_data->out_format.fmt_cfg);
|
||||
snd_mask_none(fmt);
|
||||
switch (out_sample_valid_bits) {
|
||||
case 16:
|
||||
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
|
||||
break;
|
||||
case 24:
|
||||
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);
|
||||
break;
|
||||
case 32:
|
||||
snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S32_LE);
|
||||
break;
|
||||
default:
|
||||
dev_err(sdev->dev, "invalid sample frame format %d\n",
|
||||
params_format(pipeline_params));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* set the gateway dma_buffer_size using the matched ID returned above */
|
||||
copier_data->gtw_cfg.dma_buffer_size = available_fmt->dma_buffer_size[ret];
|
||||
|
||||
data = &ipc4_copier->copier_config;
|
||||
ipc_config_size = &ipc4_copier->ipc_config_size;
|
||||
ipc_config_data = &ipc4_copier->ipc_config_data;
|
||||
|
||||
/* config_length is DWORD based */
|
||||
ipc_size = sizeof(*copier_data) + copier_data->gtw_cfg.config_length * 4;
|
||||
|
||||
dev_dbg(sdev->dev, "copier %s, IPC size is %d", swidget->widget->name, ipc_size);
|
||||
|
||||
*ipc_config_data = kzalloc(ipc_size, GFP_KERNEL);
|
||||
if (!*ipc_config_data)
|
||||
return -ENOMEM;
|
||||
|
||||
*ipc_config_size = ipc_size;
|
||||
|
||||
/* copy IPC data */
|
||||
memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data));
|
||||
if (copier_data->gtw_cfg.config_length)
|
||||
memcpy(*ipc_config_data + sizeof(*copier_data),
|
||||
*data, copier_data->gtw_cfg.config_length * 4);
|
||||
|
||||
/* update pipeline memory usage */
|
||||
sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &copier_data->base_config);
|
||||
|
||||
/* assign instance ID */
|
||||
return sof_ipc4_widget_assign_instance_id(sdev, swidget);
|
||||
}
|
||||
|
||||
static enum sof_tokens host_token_list[] = {
|
||||
SOF_COMP_TOKENS,
|
||||
SOF_AUDIO_FMT_NUM_TOKENS,
|
||||
|
@ -588,10 +872,12 @@ static enum sof_tokens dai_token_list[] = {
|
|||
static const struct sof_ipc_tplg_widget_ops tplg_ipc4_widget_ops[SND_SOC_DAPM_TYPE_COUNT] = {
|
||||
[snd_soc_dapm_aif_in] = {sof_ipc4_widget_setup_pcm, sof_ipc4_widget_free_comp_pcm,
|
||||
host_token_list, ARRAY_SIZE(host_token_list), NULL,
|
||||
NULL, NULL},
|
||||
sof_ipc4_prepare_copier_module,
|
||||
sof_ipc4_unprepare_copier_module},
|
||||
[snd_soc_dapm_aif_out] = {sof_ipc4_widget_setup_pcm, sof_ipc4_widget_free_comp_pcm,
|
||||
host_token_list, ARRAY_SIZE(host_token_list), NULL,
|
||||
NULL, NULL},
|
||||
sof_ipc4_prepare_copier_module,
|
||||
sof_ipc4_unprepare_copier_module},
|
||||
[snd_soc_dapm_dai_in] = {sof_ipc4_widget_setup_comp_dai, sof_ipc4_widget_free_comp_dai,
|
||||
dai_token_list, ARRAY_SIZE(dai_token_list), NULL, NULL, NULL},
|
||||
[snd_soc_dapm_dai_out] = {sof_ipc4_widget_setup_comp_dai, sof_ipc4_widget_free_comp_dai,
|
||||
|
|
|
@ -11,6 +11,24 @@
|
|||
|
||||
#include <sound/sof/ipc4/header.h>
|
||||
|
||||
#define SOF_IPC4_FW_PAGE_SIZE BIT(12)
|
||||
#define SOF_IPC4_FW_PAGE(x) ((((x) + BIT(12) - 1) & ~(BIT(12) - 1)) >> 12)
|
||||
#define SOF_IPC4_FW_ROUNDUP(x) (((x) + BIT(6) - 1) & (~(BIT(6) - 1)))
|
||||
|
||||
#define SOF_IPC4_MODULE_LL BIT(5)
|
||||
#define SOF_IPC4_MODULE_INSTANCE_LIST_ITEM_SIZE 12
|
||||
#define SOF_IPC4_PIPELINE_OBJECT_SIZE 448
|
||||
#define SOF_IPC4_DATA_QUEUE_OBJECT_SIZE 128
|
||||
#define SOF_IPC4_LL_TASK_OBJECT_SIZE 72
|
||||
#define SOF_IPC4_DP_TASK_OBJECT_SIZE 104
|
||||
#define SOF_IPC4_DP_TASK_LIST_SIZE (12 + 8)
|
||||
#define SOF_IPC4_LL_TASK_LIST_ITEM_SIZE 12
|
||||
#define SOF_IPC4_FW_MAX_PAGE_COUNT 20
|
||||
#define SOF_IPC4_FW_MAX_QUEUE_COUNT 8
|
||||
|
||||
/* Node index and mask applicable for host copier */
|
||||
#define SOF_IPC4_NODE_INDEX_MASK 0xFF
|
||||
#define SOF_IPC4_NODE_INDEX(x) ((x) & SOF_IPC4_NODE_INDEX_MASK)
|
||||
#define SOF_IPC4_NODE_TYPE(x) ((x) << 8)
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue