OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80d5be1
)
ASoC: meson: aiu: fifo: Add missing dma_coerce_mask_and_coherent()
author
Martin Blumenstingl
<martin.blumenstingl@googlemail.com>
Mon, 6 Dec 2021 21:08:03 +0000
(22:08 +0100)
committer
Mark Brown
<broonie@kernel.org>
Tue, 14 Dec 2021 17:15:29 +0000
(17:15 +0000)
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:
6ae9ca9ce986bf
("ASoC: meson: aiu: add i2s and spdif support")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link:
https://lore.kernel.org/r/20211206210804.2512999-2-martin.blumenstingl@googlemail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/meson/aiu-fifo.c
patch
|
blob
|
history
diff --git
a/sound/soc/meson/aiu-fifo.c
b/sound/soc/meson/aiu-fifo.c
index
4ad2326
..
d67ff4c
100644
(file)
--- a/
sound/soc/meson/aiu-fifo.c
+++ b/
sound/soc/meson/aiu-fifo.c
@@
-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);