mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
6064ed73cd
soc_pcm_open() does rollback when failed (A),
but, it is almost same as soc_pcm_close().
static int soc_pcm_open(xxx)
{
...
if (ret < 0)
goto xxx_err;
...
return 0;
^ config_err:
| ...
| rtd_startup_err:
(A) ...
| component_err:
| ...
v return ret;
}
The difference is
soc_pcm_close() is for all dai/component/substream,
rollback is for succeeded part only.
This kind of duplicated code can be a hotbed of bugs,
thus, we want to share soc_pcm_close() and rollback.
Now, soc_pcm_open/close() are handling
1) snd_soc_dai_startup/shutdown()
=> 2) snd_soc_link_startup/shutdown()
3) snd_soc_component_module_get/put()
4) snd_soc_component_open/close()
5) pm_runtime_put/get()
This patch is for 2) snd_soc_link_startup/shutdown().
The idea of having bit-flag or counter is not enough for this purpose.
For example if one DAI is used for 2xPlaybacks for some reasons,
and if 1st Playback was succeeded but 2nd Playback was failed,
2nd Playback rollback doesn't need to call shutdown.
But it has succeeded bit-flag or counter via 1st Playback,
thus, 2nd Playback rollback will call unneeded shutdown.
And 1st Playback's necessary shutdown will not be called,
because bit-flag or counter was cleared by wrong 2nd Playback rollback.
To avoid such case, this patch marks substream pointer when startup() was
succeeded. If rollback needed, it will check rollback flag and marked
substream pointer.
One note here is that it cares *current* startup() only now.
but we might want to check *whole* marked substream in the future.
This patch is using macro named "push/pop", so that it can be easily
update.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87k0webwnv.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
180 lines
4.5 KiB
C
180 lines
4.5 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
//
|
|
// soc-link.c
|
|
//
|
|
// Copyright (C) 2019 Renesas Electronics Corp.
|
|
// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
//
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-link.h>
|
|
|
|
#define soc_link_ret(rtd, ret) _soc_link_ret(rtd, __func__, ret)
|
|
static inline int _soc_link_ret(struct snd_soc_pcm_runtime *rtd,
|
|
const char *func, int ret)
|
|
{
|
|
/* Positive, Zero values are not errors */
|
|
if (ret >= 0)
|
|
return ret;
|
|
|
|
/* Negative values might be errors */
|
|
switch (ret) {
|
|
case -EPROBE_DEFER:
|
|
case -ENOTSUPP:
|
|
break;
|
|
default:
|
|
dev_err(rtd->dev,
|
|
"ASoC: error at %s on %s: %d\n",
|
|
func, rtd->dai_link->name, ret);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* We might want to check substream by using list.
|
|
* In such case, we can update these macros.
|
|
*/
|
|
#define soc_link_mark_push(rtd, substream, tgt) ((rtd)->mark_##tgt = substream)
|
|
#define soc_link_mark_pop(rtd, substream, tgt) ((rtd)->mark_##tgt = NULL)
|
|
#define soc_link_mark_match(rtd, substream, tgt) ((rtd)->mark_##tgt == substream)
|
|
|
|
int snd_soc_link_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->init)
|
|
ret = rtd->dai_link->init(rtd);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
void snd_soc_link_exit(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
if (rtd->dai_link->exit)
|
|
rtd->dai_link->exit(rtd);
|
|
}
|
|
|
|
int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->be_hw_params_fixup)
|
|
ret = rtd->dai_link->be_hw_params_fixup(rtd, params);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
int snd_soc_link_startup(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->startup)
|
|
ret = rtd->dai_link->ops->startup(substream);
|
|
|
|
/* mark substream if succeeded */
|
|
if (ret == 0)
|
|
soc_link_mark_push(rtd, substream, startup);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
void snd_soc_link_shutdown(struct snd_pcm_substream *substream,
|
|
int rollback)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
|
|
if (rollback && !soc_link_mark_match(rtd, substream, startup))
|
|
return;
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->shutdown)
|
|
rtd->dai_link->ops->shutdown(substream);
|
|
|
|
/* remove marked substream */
|
|
soc_link_mark_pop(rtd, substream, startup);
|
|
}
|
|
|
|
int snd_soc_link_prepare(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->prepare)
|
|
ret = rtd->dai_link->ops->prepare(substream);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
int snd_soc_link_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->hw_params)
|
|
ret = rtd->dai_link->ops->hw_params(substream, params);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
void snd_soc_link_hw_free(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->hw_free)
|
|
rtd->dai_link->ops->hw_free(substream);
|
|
}
|
|
|
|
int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->ops &&
|
|
rtd->dai_link->ops->trigger)
|
|
ret = rtd->dai_link->ops->trigger(substream, cmd);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
|
|
int snd_soc_link_compr_startup(struct snd_compr_stream *cstream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->compr_ops &&
|
|
rtd->dai_link->compr_ops->startup)
|
|
ret = rtd->dai_link->compr_ops->startup(cstream);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_link_compr_startup);
|
|
|
|
void snd_soc_link_compr_shutdown(struct snd_compr_stream *cstream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
|
|
|
|
if (rtd->dai_link->compr_ops &&
|
|
rtd->dai_link->compr_ops->shutdown)
|
|
rtd->dai_link->compr_ops->shutdown(cstream);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_link_compr_shutdown);
|
|
|
|
int snd_soc_link_compr_set_params(struct snd_compr_stream *cstream)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
|
|
int ret = 0;
|
|
|
|
if (rtd->dai_link->compr_ops &&
|
|
rtd->dai_link->compr_ops->set_params)
|
|
ret = rtd->dai_link->compr_ops->set_params(cstream);
|
|
|
|
return soc_link_ret(rtd, ret);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_soc_link_compr_set_params);
|