ASoC: fsl_asrc_dma: allocate memory from dma device

The dma-coherent property is used to indicate a device is capable of
coherent DMA operations. On i.MX952, one of EDMA devices support such
feature, in order to support the EDMA device, the memory needs to be
allocated from the DMA device.

Make this driver to support both non dma-coherent and dma-coherent dma
engine.

Remove dma coerce_mask_and coherent() because DMA provider already set it
according to its capability.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260206014805.3897764-5-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Shengjiu Wang 2026-02-06 09:48:05 +08:00 committed by Mark Brown
parent 6a8c6f5587
commit b010c78234
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0

View file

@ -449,18 +449,52 @@ fsl_asrc_dma_pcm_pointer(struct snd_soc_component *component,
static int fsl_asrc_dma_pcm_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{
struct snd_card *card = rtd->card->snd_card;
struct device *dev = component->dev;
struct fsl_asrc *asrc = dev_get_drvdata(dev);
struct fsl_asrc_pair *pair;
struct snd_pcm *pcm = rtd->pcm;
struct dma_chan *chan;
int ret;
ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
if (ret) {
dev_err(card->dev, "failed to set DMA mask\n");
return ret;
pair = kzalloc(size_add(sizeof(*pair), asrc->pair_priv_size), GFP_KERNEL);
if (!pair)
return -ENOMEM;
pair->asrc = asrc;
pair->private = (void *)pair + sizeof(struct fsl_asrc_pair);
/* Request a pair, which will be released later.
* Request pair function needs channel num as input, for this
* pair, we just request "1" channel temporarily.
*/
ret = asrc->request_pair(1, pair);
if (ret < 0) {
dev_err(dev, "failed to request asrc pair\n");
goto req_pair_err;
}
return snd_pcm_set_fixed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
card->dev, FSL_ASRC_DMABUF_SIZE);
/* Request a dma channel, which will be released later. */
chan = asrc->get_dma_channel(pair, IN);
if (!chan) {
dev_err(dev, "failed to get dma channel\n");
ret = -EINVAL;
goto dma_chan_err;
}
ret = snd_pcm_set_fixed_buffer_all(pcm,
SNDRV_DMA_TYPE_DEV,
chan->device->dev,
FSL_ASRC_DMABUF_SIZE);
dma_release_channel(chan);
dma_chan_err:
asrc->release_pair(pair);
req_pair_err:
kfree(pair);
return ret;
}
struct snd_soc_component_driver fsl_asrc_component = {