Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: Intel: Fix Baytrail SST DSP firmware loading

Commit 10df350977b1 ("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>

authored by

Jarkko Nikula and committed by
Mark Brown
cffd6665 2b39aab1

+1 -1
+1 -1
sound/soc/intel/sst-baytrail-dsp.c
··· 324 324 memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET, 325 325 &pdata->fw_base, sizeof(u32)); 326 326 327 - ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); 327 + ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32)); 328 328 if (ret) 329 329 return ret; 330 330