ASoC: soc-pcm: align BE 'atomicity' with that of the FE

Since the flow for DPCM is based on taking a lock for the FE first, we
need to make sure during the connection between a BE and an FE that
they both use the same 'atomicity', otherwise we may sleep in atomic
context.

If the FE is nonatomic, this patch forces the BE to be nonatomic as
well. That should have no negative impact since the BE 'inherits' the
FE properties.

However, if the FE is atomic and the BE is not, then the configuration
is flagged as invalid.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
[ removed FE stream lock by tiwai ]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20211207173745.15850-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index f66808dfb50834aa2e9823668d033a0cc9d5fce7..3a34b71fd3c1f06c6a4edb543a15379be0297e11 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1104,6 +1104,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
 static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
                struct snd_soc_pcm_runtime *be, int stream)
 {
+       struct snd_pcm_substream *fe_substream;
+       struct snd_pcm_substream *be_substream;
        struct snd_soc_dpcm *dpcm;
        unsigned long flags;
 
@@ -1113,6 +1115,20 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
                        return 0;
        }
 
+       fe_substream = snd_soc_dpcm_get_substream(fe, stream);
+       be_substream = snd_soc_dpcm_get_substream(be, stream);
+
+       if (!fe_substream->pcm->nonatomic && be_substream->pcm->nonatomic) {
+               dev_err(be->dev, "%s: FE is atomic but BE is nonatomic, invalid configuration\n",
+                       __func__);
+               return -EINVAL;
+       }
+       if (fe_substream->pcm->nonatomic && !be_substream->pcm->nonatomic) {
+               dev_warn(be->dev, "%s: FE is nonatomic but BE is not, forcing BE as nonatomic\n",
+                        __func__);
+               be_substream->pcm->nonatomic = 1;
+       }
+
        dpcm = kzalloc(sizeof(struct snd_soc_dpcm), GFP_ATOMIC);
        if (!dpcm)
                return -ENOMEM;