Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aab3fa54 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ASoC: xilinx: Fix reference to PCM buffer address 



commit 42bc62c9f1d3d4880bdc27acb5ab4784209bb0b0 upstream.

PCM buffers might be allocated dynamically when the buffer
preallocation failed or a larger buffer is requested, and it's not
guaranteed that substream->dma_buffer points to the actually used
buffer.  The driver needs to refer to substream->runtime->dma_addr
instead for the buffer address.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210728112353.6675-4-tiwai@suse.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60e2854a

sound/soc/xilinx/xlnx_formatter_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ static int xlnx_formatter_pcm_hw_params(struct snd_pcm_substream *substream, 


	stream_data->buffer_size = size;



	low = lower_32_bits(substream->dma_buffer.addr);

	high = upper_32_bits(substream->dma_buffer.addr);

	low = lower_32_bits(runtime->dma_addr);

	high = upper_32_bits(runtime->dma_addr);

	writel(low, stream_data->mmio + XLNX_AUD_BUFF_ADDR_LSB);

	writel(high, stream_data->mmio + XLNX_AUD_BUFF_ADDR_MSB);