MLK-16956: ASoC: fsl_asrc: fix error with S24_3LE format bitstream

The error is "aplay: pcm_write:2023: write error: Input/output error"

query the caps of dma, then update the hw parameters according
the caps. for EDMA can't support 24bit sample, but we didn't
add any constraint, that cause issues.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 9293f67..4236f8a 100644 (file)
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -110,7 +110,7 @@ static unsigned char output_clk_map_imx8_1[] = {
  * within range [ANCA, ANCA+ANCB-1], depends on the channels of pair A
  * while pair A and pair C are comparatively independent.
  */
-static int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair)
+int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair)
 {
        enum asrc_pair_index index = ASRC_INVALID_PAIR;
        struct fsl_asrc *asrc_priv = pair->asrc_priv;
@@ -195,7 +195,7 @@ static int proc_autosel(int Fsin, int Fsout, int *pre_proc, int *post_proc)
  *
  * It clears the resource from asrc_priv and releases the occupied channels.
  */
-static void fsl_asrc_release_pair(struct fsl_asrc_pair *pair)
+void fsl_asrc_release_pair(struct fsl_asrc_pair *pair)
 {
        struct fsl_asrc *asrc_priv = pair->asrc_priv;
        enum asrc_pair_index index = pair->index;

diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h
index 5d2f021..8908202 100644 (file)
--- a/sound/soc/fsl/fsl_asrc.h
+++ b/sound/soc/fsl/fsl_asrc.h
@@ -377,5 +377,7 @@ struct fsl_asrc {
 
 extern struct snd_soc_platform_driver fsl_asrc_platform;
 struct dma_chan *fsl_asrc_get_dma_channel(struct fsl_asrc_pair *pair, bool dir);
+int fsl_asrc_request_pair(int channels, struct fsl_asrc_pair *pair);
+void fsl_asrc_release_pair(struct fsl_asrc_pair *pair);
 
 #endif /* _FSL_ASRC_H */

diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
index c5e3f09..3c2f2b0 100644 (file)
--- a/sound/soc/fsl/fsl_asrc_dma.c
+++ b/sound/soc/fsl/fsl_asrc_dma.c
@@ -24,9 +24,7 @@ static struct snd_pcm_hardware snd_imx_hardware = {
        .info = SNDRV_PCM_INFO_INTERLEAVED |
                SNDRV_PCM_INFO_BLOCK_TRANSFER |
                SNDRV_PCM_INFO_MMAP |
-               SNDRV_PCM_INFO_MMAP_VALID |
-               SNDRV_PCM_INFO_PAUSE |
-               SNDRV_PCM_INFO_RESUME,
+               SNDRV_PCM_INFO_MMAP_VALID,
        .buffer_bytes_max = FSL_ASRC_DMABUF_SIZE,
        .period_bytes_min = 128,
        .period_bytes_max = 65532, /* Limited by SDMA engine */
@@ -311,7 +309,16 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream)
        struct device *dev = rtd->platform->dev;
        struct fsl_asrc *asrc_priv = dev_get_drvdata(dev);
        struct fsl_asrc_pair *pair;
+       bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+       u8 dir = tx ? OUT : IN;
+       struct dma_slave_caps dma_caps;
+       struct dma_chan *tmp_chan;
+       struct snd_dmaengine_dai_dma_data *dma_data;
+       u32 addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |
+                         BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) |
+                         BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
        int ret;
+       int i;
 
        pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL);
        if (!pair) {
@@ -329,6 +336,72 @@ static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream)
                dev_err(dev, "failed to set pcm hw params periods\n");
                return ret;
        }
+
+       dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+
+       fsl_asrc_request_pair(1, pair);
+
+       tmp_chan = fsl_asrc_get_dma_channel(pair, dir);
+       if (!tmp_chan) {
+               dev_err(dev, "can't get dma channel\n");
+               return -EINVAL;
+       }
+
+       ret = dma_get_slave_caps(tmp_chan, &dma_caps);
+       if (ret == 0) {
+               if (dma_caps.cmd_pause)
+                       snd_imx_hardware.info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME;
+               if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT)
+                       snd_imx_hardware.info |= SNDRV_PCM_INFO_BATCH;
+
+               if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                       addr_widths = dma_caps.dst_addr_widths;
+               else
+                       addr_widths = dma_caps.src_addr_widths;
+       }
+
+       /*
+        * If SND_DMAENGINE_PCM_DAI_FLAG_PACK is set keep
+        * hw.formats set to 0, meaning no restrictions are in place.
+        * In this case it's the responsibility of the DAI driver to
+        * provide the supported format information.
+        */
+       if (!(dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK))
+               /*
+                * Prepare formats mask for valid/allowed sample types. If the
+                * dma does not have support for the given physical word size,
+                * it needs to be masked out so user space can not use the
+                * format which produces corrupted audio.
+                * In case the dma driver does not implement the slave_caps the
+                * default assumption is that it supports 1, 2 and 4 bytes
+                * widths.
+                */
+               for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {
+                       int bits = snd_pcm_format_physical_width(i);
+
+                       /*
+                        * Enable only samples with DMA supported physical
+                        * widths
+                        */
+                       switch (bits) {
+                       case 8:
+                       case 16:
+                       case 24:
+                       case 32:
+                       case 64:
+                               if (addr_widths & (1 << (bits / 8)))
+                                       snd_imx_hardware.formats |= (1LL << i);
+                               break;
+                       default:
+                               /* Unsupported types */
+                               break;
+                       }
+               }
+
+       if (tmp_chan)
+               dma_release_channel(tmp_chan);
+       fsl_asrc_release_pair(pair);
+
        snd_soc_set_runtime_hwparams(substream, &snd_imx_hardware);
 
        return 0;