Unverified Commit 1bcd3266 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Mark Brown
Browse files

ASoC: meson: aiu: fifo: Add missing dma_coerce_mask_and_coherent() 



The FIFO registers which take an DMA-able address are only 32-bit wide
on AIU. Add dma_coerce_mask_and_coherent() to make the DMA core aware of
this limitation.

Fixes: 6ae9ca9c ("ASoC: meson: aiu: add i2s and spdif support")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20211206210804.2512999-2-martin.blumenstingl@googlemail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 80d5be1a

sound/soc/meson/aiu-fifo.c

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/bitfield.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>
@@ -179,6 +180,11 @@ int aiu_fifo_pcm_new(struct snd_soc_pcm_runtime *rtd, 
	struct snd_card *card = rtd->card->snd_card;

	struct aiu_fifo *fifo = dai->playback_dma_data;

	size_t size = fifo->pcm->buffer_bytes_max;

	int ret;



	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



	snd_pcm_set_managed_buffer_all(rtd->pcm, SNDRV_DMA_TYPE_DEV,

				       card->dev, size, size);