From patchwork Sun Sep 6 01:13:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 7130501 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B6AA6BEEC1 for ; Sun, 6 Sep 2015 01:19:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C74262089D for ; Sun, 6 Sep 2015 01:19:50 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 7331920573 for ; Sun, 6 Sep 2015 01:19:49 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id AA78726155D; Sun, 6 Sep 2015 03:19:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id DBE0526153F; Sun, 6 Sep 2015 03:16:53 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8531B261537; Sun, 6 Sep 2015 03:16:52 +0200 (CEST) Received: from lucky1.263xmail.com (lucky1.263xmail.com [211.157.147.130]) by alsa0.perex.cz (Postfix) with ESMTP id 9F42D26153F for ; Sun, 6 Sep 2015 03:15:12 +0200 (CEST) Received: from shawn.lin?rock-chips.com (unknown [192.168.167.229]) by lucky1.263xmail.com (Postfix) with SMTP id B9E601E5600; Sun, 6 Sep 2015 09:15:10 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 62A6145F; Sun, 6 Sep 2015 09:15:07 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: vinod.koul@intel.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <3c150bd95671f625537184535a5d0d84> X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 22643QYNPYM; Sun, 06 Sep 2015 09:15:09 +0800 (CST) From: Shawn Lin To: Vinod Koul , Heiko Stuebner , Jaroslav Kysela , Takashi Iwai , Mark Brown Date: Sun, 6 Sep 2015 09:13:28 +0800 Message-Id: <1441502008-14116-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1441501881-13700-1-git-send-email-shawn.lin@rock-chips.com> References: <1441501881-13700-1-git-send-email-shawn.lin@rock-chips.com> Cc: Addy Ke , alsa-devel@alsa-project.org, Yiwei Cai , Olof Johansson , Shawn Lin , Olof Johansson , Doug Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jianqun Xu , dmaengine@vger.kernel.org, linux-spi@vger.kernel.org, Sonny Rao , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH v4 10/10] ASoC: rockchip_i2s: modify DMA max burst to 1 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Yiwei Cai Test with command - arecord -D hw:0,0 /tmp/a.wav, there are the error dump: dma-pl330 ffb20000.dma-controller: fill_queue:2251 Bad Desc(7) This error is happening when no a multiple of burst size * burst length are coming in. The root cause is pl330 dma controller on Rockchips' platform cannot support DMAFLUSHP instruction which make dma to flush the req of non-aligned or non-multiple of what we set before. The saftest way is to set dma max burst to 1. Signed-off-by: Yiwei Cai Fixes: 4495c89fc ("ASoC: add driver for Rockchip RK3xxx I2S") Signed-off-by: Shawn Lin cc: Addy Ke cc: Jianqun Xu cc: Heiko Stuebner cc: Olof Johansson cc: Doug Anderson cc: Sonny Rao --- Changes in v4: - use snd_dmaengine_pcm_get_quirks to get quirks Changes in v3: None Changes in v2: None Changes in v1: None sound/soc/rockchip/rockchip_i2s.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index acb5be5..b06e08a 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -23,6 +23,8 @@ #define DRV_NAME "rockchip-i2s" +#define ROCKCHIP_I2S_BROKEN_BURST_LEN (1<<0) /* broken burst len */ + struct rk_i2s_dev { struct device *dev; @@ -418,6 +420,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) struct rk_i2s_dev *i2s; struct resource *res; void __iomem *regs; + int dma_quirk; int ret; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); @@ -460,7 +463,6 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->playback_dma_data.addr = res->start + I2S_TXDR; i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; i2s->playback_dma_data.maxburst = 4; - i2s->capture_dma_data.addr = res->start + I2S_RXDR; i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; i2s->capture_dma_data.maxburst = 4; @@ -489,6 +491,18 @@ static int rockchip_i2s_probe(struct platform_device *pdev) goto err_pcm_register; } + dma_quirk = snd_dmaengine_pcm_get_quirks(&pdev->dev); + if (dma_quirk == ROCKCHIP_I2S_BROKEN_BURST_LEN) { + /* + * Unfortunately, we find broken burst len here, + * just have to limit maxburst to ONE in order to avoid + * non-multiple burst len access fail the dmaengine if + * it can't support flush peripheral function. + */ + i2s->playback_dma_data.maxburst = 1; + i2s->capture_dma_data.maxburst = 1; + } + return 0; err_pcm_register: