| Message ID | 1399643264-7669-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5e6299c35010a10a343b66c6be69652e9fdb4959 |
| Headers | show |
On Fri, May 09, 2014 at 04:47:43PM +0300, Jarkko Nikula wrote: > 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 Is this needed on fix/intel? If so it doesn't apply there...
On 05/13/2014 01:09 AM, Mark Brown wrote: > On Fri, May 09, 2014 at 04:47:43PM +0300, Jarkko Nikula wrote: >> 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 > Is this needed on fix/intel? If so it doesn't apply there... Indeed it doesn't. I accidentally made it on top of my suspend/resume set and it appears to conflict without [PATCH 4/7] ASoC: Intel: Move Baytrail extended fw address saving to sst_byt_boot()". In case you are thinking to queue Liam's 10df350977b1 as a fix Is it ok if I resend this on top of it and handle conflict when merging origin/topic/intel?
On Tue, May 13, 2014 at 10:22:08AM +0300, Jarkko Nikula wrote: > In case you are thinking to queue Liam's 10df350977b1 as a fix Is it ok if I > resend this on top of it and handle conflict when merging > origin/topic/intel? Yes, it's on my fix/intel branch - please send a fix based off that.
On Fri, May 09, 2014 at 04:47:43PM +0300, Jarkko Nikula wrote: > - 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; My resolution of the merge of your revised version and topic/intel looks like this so I *think* it's OK but please check that I did the right thing.
On 05/13/2014 08:26 PM, Mark Brown wrote: > On Fri, May 09, 2014 at 04:47:43PM +0300, Jarkko Nikula wrote: > >> - 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; > My resolution of the merge of your revised version and topic/intel looks > like this so I *think* it's OK but please check that I did the right > thing. Thanks, it's ok! And sorry the mess, I was somehow blind to see Liam's patch being 3.15 material. Hurry to weekend I guess.
diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/sst-baytrail-dsp.c index 4a5d489e520b..fc588764ffa3 100644 --- a/sound/soc/intel/sst-baytrail-dsp.c +++ b/sound/soc/intel/sst-baytrail-dsp.c @@ -324,7 +324,7 @@ static int sst_byt_init(struct sst_dsp *sst, struct sst_pdata *pdata) return ret; } - 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;
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> --- sound/soc/intel/sst-baytrail-dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)