@@ -41,6 +41,12 @@ void snd_soc_dpcm_fe_unlock_irq(struct snd_soc_pcm_runtime *fe, int stream)
}
EXPORT_SYMBOL_GPL(snd_soc_dpcm_fe_unlock_irq);
+#define snd_soc_dpcm_be_lock_irqsave(be, stream, flags) \
+ snd_pcm_stream_lock_irqsave(snd_soc_dpcm_get_substream(be, stream), flags)
+
+#define snd_soc_dpcm_be_unlock_irqrestore(be, stream, flags) \
+ snd_pcm_stream_unlock_irqrestore(snd_soc_dpcm_get_substream(be, stream), flags)
+
/* can this BE stop and free */
static int snd_soc_dpcm_can_be_free_stop_locked(struct snd_soc_pcm_runtime *fe,
struct snd_soc_pcm_runtime *be, int stream);
@@ -2071,6 +2077,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
{
struct snd_soc_pcm_runtime *be;
struct snd_soc_dpcm *dpcm;
+ unsigned long flags;
int ret = 0;
for_each_dpcm_be(fe, stream, dpcm) {
@@ -2086,85 +2093,89 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
dev_dbg(be->dev, "ASoC: trigger BE %s cmd %d\n",
be->dai_link->name, cmd);
+ snd_soc_dpcm_be_lock_irqsave(be, stream, flags);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_START;
break;
case SNDRV_PCM_TRIGGER_RESUME:
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_START;
break;
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_START;
break;
case SNDRV_PCM_TRIGGER_STOP:
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
- continue;
+ goto unlock_be;
if (!snd_soc_dpcm_can_be_free_stop_locked(fe, be, stream))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP;
break;
case SNDRV_PCM_TRIGGER_SUSPEND:
if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
- continue;
+ goto unlock_be;
if (!snd_soc_dpcm_can_be_free_stop_locked(fe, be, stream))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_SUSPEND;
break;
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
- continue;
+ goto unlock_be;
if (!snd_soc_dpcm_can_be_free_stop_locked(fe, be, stream))
- continue;
+ goto unlock_be;
ret = soc_pcm_trigger(be_substream, cmd);
if (ret)
- goto end;
+ goto unlock_be;
be->dpcm[stream].state = SND_SOC_DPCM_STATE_PAUSED;
break;
}
+unlock_be:
+ snd_soc_dpcm_be_unlock_irqrestore(be, stream, flags);
+ if (ret < 0) {
+ dev_err(fe->dev, "ASoC: %s() failed at %s (%d)\n",
+ __func__, be->dai_link->name, ret);
+ break;
+ }
}
-end:
- if (ret < 0)
- dev_err(fe->dev, "ASoC: %s() failed at %s (%d)\n",
- __func__, be->dai_link->name, ret);
return ret;
}
EXPORT_SYMBOL_GPL(dpcm_be_dai_trigger);
When more than one FE is connected to a BE, e.g. in a mixing use case, the BE can be triggered multiple times when the FE are opened/started concurrently. This race condition is problematic in the case of SoundWire BE dailinks, and this is not desirable in a general case. This patch relies on the existing BE PCM lock, which takes atomicity into account. The locking model assumes that all interactions start with the FE, so that there is no deadlock between FE and BE locks. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/soc-pcm.c | 49 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 19 deletions(-)