Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1247301

[PATCH v6 10/10] ASoC: rockchip_i2s: modify DMA max burst to 1

Show all headers | View raw

From: Yiwei Cai <cain.cai@rock-chips.com>

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 <cain.cai@rock-chips.com>
Fixes: 4495c89fc ("ASoC: add driver for Rockchip RK3xxx I2S")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
cc: Addy Ke <addy.ke@rock-chips.com>
cc: Jianqun Xu <xjq@rock-chips.com>
cc: Heiko Stuebner <heiko@sntech.de>
cc: Olof Johansson <olof@lixom.net>
cc: Doug Anderson <dianders@chromium.org>
cc: Sonny Rao <sonnyrao@chromium.org>

Acked-by: Mark Brown <broonie@kernel.org>
---

Changes in v6:
- remove quirks and get dma caps in order to limit burst

Changes in v5:
- use switch statement for dma_quirk's manipulation

Changes in v4: None
Changes in v3: None
Changes in v2: None
Changes in v1: None

 sound/soc/rockchip/rockchip_i2s.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index b936102..f00200a 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -418,6 +418,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 	struct rk_i2s_dev *i2s;
 	struct resource *res;
 	void __iomem *regs;
+	struct dma_slave_caps *dma_caps;
 	int ret;
 
 	i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
@@ -459,11 +460,24 @@ 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;
+
+	if (snd_dmaengine_pcm_get_caps(&pdev->dev, &dma_caps) == 0) {
+		if (dma_caps.max_burst > 4) {
+			i2s->playback_dma_data.maxburst = 4;
+			i2s->capture_dma_data.maxburst = 4;
+		} else {
+			i2s->playback_dma_data.maxburst = 1;
+			i2s->capture_dma_data.maxburst = 1;
+		}
+	} else {
+		i2s->playback_dma_data.maxburst = 1;
+		i2s->capture_dma_data.maxburst = 1;
+		dev_info(&pdev->dev,
+			 "Can't get dma caps, default limit maxburst to 1.\n");
+	}
 
 	i2s->dev = &pdev->dev;
 	dev_set_drvdata(&pdev->dev, i2s);
-- 
2.3.7


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 0/10] Fix broken DMAFLUSHP on Rockchips platform Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 04/10] ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3288 platform Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 01/10] DMA: pl330: support burst mode for dev-to-mem and mem-to-dev transmit Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
    Re: [PATCH v6 01/10] DMA: pl330: support burst mode for dev-to-mem  and mem-to-dev transmit Vinod Koul <vinod.koul@intel.com> - 2015-10-15 06:10 +0200
      Re: [PATCH v6 01/10] DMA: pl330: support burst mode for dev-to-mem  and mem-to-dev transmit Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 09:00 +0200
  [PATCH v6 02/10] Documentation: arm-pl330: add description of arm,pl330-broken-no-flushp Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 05/10] ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3xxx platform Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 10/10] ASoC: rockchip_i2s: modify DMA max burst to 1 Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
    Re: [PATCH v6 10/10] ASoC: rockchip_i2s: modify DMA max burst to  1 Lars-Peter Clausen <lars@metafoo.de> - 2015-10-15 11:00 +0200
      Re: [PATCH v6 10/10] ASoC: rockchip_i2s: modify DMA max burst to 1 Jianqun Xu <jay.xu@rock-chips.com> - 2015-10-15 12:50 +0200
  [PATCH v6 07/10] DMA: pl330: add max burst for dmaengine Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 03/10] DMA: pl330: add quirk for broken no flushp Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 06/10] DMA: dmaengine: expose max burst capability to clients Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 03:40 +0200
  [PATCH v6 08/10] spi: rockchip: modify DMA max burst to 1 Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 04:00 +0200
  [PATCH v6 09/10] snd: dmaengine-pcm: add snd_dmaengine_pcm_get_caps interface Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 04:00 +0200
    Re: [alsa-devel] [PATCH v6 09/10] snd: dmaengine-pcm: add  snd_dmaengine_pcm_get_caps interface kbuild test robot <lkp@intel.com> - 2015-10-15 05:10 +0200
    Re: [PATCH v6 09/10] snd: dmaengine-pcm: add  snd_dmaengine_pcm_get_caps interface Vinod Koul <vinod.koul@intel.com> - 2015-10-15 06:10 +0200
      Re: [PATCH v6 09/10] snd: dmaengine-pcm: add  snd_dmaengine_pcm_get_caps interface Shawn Lin <shawn.lin@rock-chips.com> - 2015-10-15 09:00 +0200

csiph-web