From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity From: Vinod Koul Message-Id: <20180619042908.GM25852@vkoul-mobl> Date: Tue, 19 Jun 2018 09:59:08 +0530 To: Janusz Krzysztofik Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Ujfalusi , Jarkko Nikula , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, Aaro Koskinen , Tony Lindgren , linux-arm-kernel@lists.infradead.org List-ID: T24gMDUtMDYtMTgsIDE4OjU5LCBKYW51c3ogS3J6eXN6dG9maWsgd3JvdGU6Cj4gQ29tbWl0IDAx OThkN2JiOGEwYyAoIkFTb0M6IG9tYXAtbWNic3A6IENvbnZlcnQgdG8gdXNlIHRoZSBzZG1hLXBj bQo+IGluc3RlYWQgb2Ygb21hcC1wY20iKSByZXN1bHRlZCBpbiBicm9rZW4gYXVkaW8gcGxheWJh Y2sgb24gT01BUDE1MTAKPiAoZGlzY292ZXJlZCBvbiBBbXN0cmFkIERlbHRhKS4KPiAKPiBXaGVu IHJ1bm5pbmcgb24gT01BUDE1MTAsIG9tYXAtcGNtIHVzZWQgdG8gb2J0YWluIERNQSBvZmZzZXQg ZnJvbQo+IHNuZF9kbWFlbmdpbmVfcGNtX3BvaW50ZXJfbm9fcmVzaWR1ZSgpIGJhc2VkIG9uIERN QSBpbnRlcnJ1cHQgdHJpZ2dlcmVkCj4gc29mdHdhcmUgY2FsY3VsYXRpb25zIGluc3RlYWQgb2Yg c25kX2RtYWVuZ2luZV9wY21fcG9pbnRlcigpIHdoaWNoCj4gZGVwZW5kZWQgb24gcmVzaWR1ZSB2 YWx1ZSBjYWxjdWxhdGVkIGZyb20gb21hcF9kbWFfZ2V0X3NyY19wb3MoKS4KPiBTaW1pbGFyIGNv ZGUgcGF0aCBpcyBzdGlsbCBhdmFpbGFibGUgaW4gbm93IHVzZWQKPiBzb3VuZC9zb2Mvc29jLWdl bmVyaWMtZG1hZW5naW5lLXBjbS5jIGJ1dCBpdCBpcyBub3QgdHJpZ2dlcmVkLgo+IAo+IEl0IHdh cyB2ZXJpZmllZCBhbHJlYWR5IGJlZm9yZSB0aGF0IG9tYXBfZ2V0X2RtYV9zcmNfcG9zKCkgZnJv bQo+IGFyY2gvYXJtL3BsYXQtb21hcC9kbWEuYyBkaWRuJ3Qgd29yayBjb3JyZWN0bHkgZm9yIE9N QVAxNTEwIC0gc2VlCj4gY29tbWl0IDFiZGQ3NDE5OTEwYyAoIkFTb0M6IE9NQVA6IGZpeCBPTUFQ MTUxMCBicm9rZW4gUENNIHBvaW50ZXIKPiBjYWxsYmFjayIpIGZvciBkZXRhaWxzLiAgQXBwYXJl bnRseSB0aGUgc2FtZSBhcHBsaWVzIHRvIGl0cyBzdWNjZXNzb3IsCj4gb21hcF9kbWFfZ2V0X3Ny Y19wb3MoKSBmcm9tIGRyaXZlcnMvZG1hL3RpL29tYXAtZG1hLmMuCj4gCj4gT24gdGhlIG90aGVy IGhhbmQsIHNuZF9kbWFlbmdpbmVfcGNtX3BvaW50ZXJfbm9fcmVzaWR1ZSgpIGlzIGRlc2NyaWJl ZAo+IGFzIGRlcHJlY2lhdGVkIGFuZCBkaXNjb3VyYWdlZCBmb3IgdXNlIGluIG5ldyBkcml2ZXJz IGJlY2F1c2Ugb2YgaXRzCj4gdW5yZWxpYWJsZSBhY2N1cmFjeS4gIEhvd2V2ZXIsIGl0IHNlZW1z IHRoZSBvbmx5IHdvcmtpbmcgb3B0aW9uIGZvcgo+IE9QQU0xNTEwIG5vdywgYXMgbG9uZyBhcyBh IHNvZnR3YXJlIGNhbGN1bGF0ZWQgcmVzaWR1ZSBpcyBub3QKPiBpbXBsZW1lbnRlZCBhcyBPTUFQ MTUxMCBmYWxsYmFjayBpbiBvbWFwLWRtYS4KPiAKPiBVc2luZyBzbmRfZG1hZW5naW5lX3BjbV9w b2ludGVyX25vX3Jlc2lkdWUoKSBjb2RlIHBhdGggaW5zdGVhZCBvZgo+IHNuZF9kbWFlbmdpbmVf cGNtX3BvaW50ZXIoKSBpbiBzb3VuZC9zb2Mvc29jLWdlbmVyaWMtZG1hZW5naW5lLXBjbS5jCj4g Y2FuIGJlIHRyaWdnZXJlZCBpbiB0d28gd2F5czoKPiAtIGJ5IHBhc3NpbmcgcGNtLT5mbGFncyB8 PSBTTkRfRE1BRU5HSU5FX1BDTV9GTEFHX05PX1JFU0lEVUUgZnJvbQo+ICAgc291bmQvc29jL29t YXAvc2RtYS1wY20uYywKPiAtIGJ5IHBhc3NpbmcgZG1hX2NhcHMucmVzaWR1ZV9ncmFudWxhcml0 eSA9Cj4gICBETUFfUkVTSURVRV9HUkFOVUxBUklUWV9ERVNDUklQVE9SIGZyb20gRE1BIGVuZ2lu ZS4KPiAKPiBMZXQncyBkbyB0aGUgbGF0dGVyLgo+IAo+IENyZWF0ZWQgYW5kIHRlc3RlZCBhZ2Fp bnN0IG5leHQtMjAxODA1MzEgdGFnIGZyb20gbGludXgtbmV4dCB0cmVlLgoKVGhpcyBpcyBub3Qg dXNlZnVsIGZvciBsb2cuCgpJIGhhdmUgc3RyaXBwZWQgdGhpcyBhbmQgYXBwbGllZAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00909C433EF for ; Tue, 19 Jun 2018 04:29:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AADA120874 for ; Tue, 19 Jun 2018 04:29:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="n4gJuJ3G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AADA120874 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965348AbeFSE3T (ORCPT ); Tue, 19 Jun 2018 00:29:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:40980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbeFSE3R (ORCPT ); Tue, 19 Jun 2018 00:29:17 -0400 Received: from localhost (unknown [106.200.222.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F337620661; Tue, 19 Jun 2018 04:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529382556; bh=dFalYT9mILSAljBoFp6rIikURZldsFLL31jACZnhyjE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n4gJuJ3GgdsncMQzNz1j6MkMHtBeme4w6jqcusulKAtn4kObNRB7F3DYXfi8zZbKc u1qDBet+8a527bDs8AFmRx7JliChQgFZ6hB0ssS0AfnOVXEqjtzhreEhLUiMbpit29 OxWbBZt5U7n9/pQzxxH8vz+jikHlzd8WU70IXFTA= Date: Tue, 19 Jun 2018 09:59:08 +0530 From: Vinod To: Janusz Krzysztofik Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Ujfalusi , Jarkko Nikula , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, Aaro Koskinen , Tony Lindgren , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2] dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity Message-ID: <20180619042908.GM25852@vkoul-mobl> References: <20180605165957.29616-1-jmkrzyszt@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180605165957.29616-1-jmkrzyszt@gmail.com> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05-06-18, 18:59, Janusz Krzysztofik wrote: > Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm > instead of omap-pcm") resulted in broken audio playback on OMAP1510 > (discovered on Amstrad Delta). > > When running on OMAP1510, omap-pcm used to obtain DMA offset from > snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered > software calculations instead of snd_dmaengine_pcm_pointer() which > depended on residue value calculated from omap_dma_get_src_pos(). > Similar code path is still available in now used > sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered. > > It was verified already before that omap_get_dma_src_pos() from > arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see > commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer > callback") for details. Apparently the same applies to its successor, > omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c. > > On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described > as depreciated and discouraged for use in new drivers because of its > unreliable accuracy. However, it seems the only working option for > OPAM1510 now, as long as a software calculated residue is not > implemented as OMAP1510 fallback in omap-dma. > > Using snd_dmaengine_pcm_pointer_no_residue() code path instead of > snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c > can be triggered in two ways: > - by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from > sound/soc/omap/sdma-pcm.c, > - by passing dma_caps.residue_granularity = > DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine. > > Let's do the latter. > > Created and tested against next-20180531 tag from linux-next tree. This is not useful for log. I have stripped this and applied -- ~Vinod From mboxrd@z Thu Jan 1 00:00:00 1970 From: vkoul@kernel.org (Vinod) Date: Tue, 19 Jun 2018 09:59:08 +0530 Subject: [PATCH v2] dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity In-Reply-To: <20180605165957.29616-1-jmkrzyszt@gmail.com> References: <20180605165957.29616-1-jmkrzyszt@gmail.com> Message-ID: <20180619042908.GM25852@vkoul-mobl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 05-06-18, 18:59, Janusz Krzysztofik wrote: > Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm > instead of omap-pcm") resulted in broken audio playback on OMAP1510 > (discovered on Amstrad Delta). > > When running on OMAP1510, omap-pcm used to obtain DMA offset from > snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered > software calculations instead of snd_dmaengine_pcm_pointer() which > depended on residue value calculated from omap_dma_get_src_pos(). > Similar code path is still available in now used > sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered. > > It was verified already before that omap_get_dma_src_pos() from > arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see > commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer > callback") for details. Apparently the same applies to its successor, > omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c. > > On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described > as depreciated and discouraged for use in new drivers because of its > unreliable accuracy. However, it seems the only working option for > OPAM1510 now, as long as a software calculated residue is not > implemented as OMAP1510 fallback in omap-dma. > > Using snd_dmaengine_pcm_pointer_no_residue() code path instead of > snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c > can be triggered in two ways: > - by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from > sound/soc/omap/sdma-pcm.c, > - by passing dma_caps.residue_granularity = > DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine. > > Let's do the latter. > > Created and tested against next-20180531 tag from linux-next tree. This is not useful for log. I have stripped this and applied -- ~Vinod