ASoC: amd :High hw_level while simultaneous capture

Simultaneous capture on dmic and headset mic is having
issue with high hw_level being reported.

Issue Can be reproduced by:
arecord -D hw:2,0 -f dat -d 60 /tmp/test0 &
arecord -D hw:2,2 -f dat -d 60 /tmp/test1 &
cat /proc/asound/card2/pcm?c/sub0/status

Actual issue is :
When we open one capture stream on one instance lets say I2S_SP and then
once again if we open other capture on other instance lets say I2S_BT while
first capture is in progress and when we try to read the status of both
running instances by below command cat /proc/asound/card2/pcm?c/sub0/status
we observe that avail_max is being doubled on first opened
capture(I2S_SP in the example).

This is because our previous implementation was like when any instance is
opened it gets initialized in dma_open irrespective of on what instance it
called open.

For example:
First I2S_SP called opened it initializes both SP/BT capture streams
irrespective of on which instance the stream opened.next time I2S_BT
called opened and it initializes both SP/BT this corrupts the behaviour .

So with this patch the stream gets initialized only on specific instance
when ever it gets opened calls hw_params.

This rectifies the issue.

Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Link: https://lore.kernel.org/r/20200506102602.140790-1-akshu.agrawal@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c
index e362f0b..a36c5cb 100644 (file)
--- a/sound/soc/amd/raven/acp3x-pcm-dma.c
+++ b/sound/soc/amd/raven/acp3x-pcm-dma.c
@@ -241,14 +241,6 @@ static int acp3x_dma_open(struct snd_soc_component *component,
                adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
                rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
 
-       if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-               adata->play_stream = substream;
-               adata->i2ssp_play_stream = substream;
-       } else {
-               adata->capture_stream = substream;
-               adata->i2ssp_capture_stream = substream;
-       }
-
        i2s_data->acp3x_base = adata->acp3x_base;
        runtime->private_data = i2s_data;
        return ret;
@@ -263,23 +255,42 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component,
        struct snd_soc_pcm_runtime *prtd;
        struct snd_soc_card *card;
        struct acp3x_platform_info *pinfo;
+       struct i2s_dev_data *adata;
        u64 size;
 
        prtd = substream->private_data;
        card = prtd->card;
        pinfo = snd_soc_card_get_drvdata(card);
+       adata = dev_get_drvdata(component->dev);
        rtd = substream->runtime->private_data;
        if (!rtd)
                return -EINVAL;
 
-       if (pinfo)
-               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+       if (pinfo) {
+               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                        rtd->i2s_instance = pinfo->play_i2s_instance;
-               else
+                       switch (rtd->i2s_instance) {
+                       case I2S_BT_INSTANCE:
+                               adata->play_stream = substream;
+                               break;
+                       case I2S_SP_INSTANCE:
+                       default:
+                               adata->i2ssp_play_stream = substream;
+                       }
+               } else {
                        rtd->i2s_instance = pinfo->cap_i2s_instance;
-       else
+                       switch (rtd->i2s_instance) {
+                       case I2S_BT_INSTANCE:
+                               adata->capture_stream = substream;
+                               break;
+                       case I2S_SP_INSTANCE:
+                       default:
+                               adata->i2ssp_capture_stream = substream;
+                       }
+               }
+       } else {
                pr_err("pinfo failed\n");
-
+       }
        size = params_buffer_bytes(params);
        rtd->dma_addr = substream->dma_buffer.addr;
        rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);