Commit cffd6665 authored May 13, 2014 by Jarkko Nikula Committed by Mark Brown May 13, 2014

ASoC: Intel: Fix Baytrail SST DSP firmware loading



Commit 10df3509 ("ASoC: Intel: Fix Audio DSP usage when IOMMU is
enabled.") caused following regression in Baytrail SST:

baytrail-pcm-audio baytrail-pcm-audio: error: DMA alloc failed
baytrail-pcm-audio baytrail-pcm-audio: error: failed to load firmware

Fix this by calling dma_coerce_mask_and_coherent() in sst_byt_init() with
the same dma_dev device what is now used in sst_fw_new() when allocating the
DMA buffer.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 2b39aab1

sound/soc/intel/sst-baytrail-dsp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -324,7 +324,7 @@ static int sst_byt_init(struct sst_dsp sst, struct sst_pdata pdata)
		memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
		&pdata->fw_base, sizeof(u32));

		ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
		ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));
		if (ret)
		return ret;