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

Groups > linux.kernel > #1247311

[PATCH v6 08/10] spi: rockchip: modify DMA max burst to 1

Show all headers | View raw

From: Addy Ke <addy.ke@rock-chips.com>

Generic 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 need. That will cause an unrecoverable
dma bus error. The saftest way is to set dma max burst to 1.

Signed-off-by: Addy ke <addy.ke@rock-chips.com>
Fixes: 64e36824b32b06 ("spi/rockchip: add driver for Rockchip...")
Signed-off-by: Shawn Lin <shawn.lin@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: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
Changes in v1: None

 drivers/spi/spi-rockchip.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 79a8bc4..aa9561f 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -199,6 +199,7 @@ struct rockchip_spi {
 	struct sg_table rx_sg;
 	struct rockchip_spi_dma_data dma_rx;
 	struct rockchip_spi_dma_data dma_tx;
+	struct dma_slave_caps dma_caps;
 };
 
 static inline void spi_enable_chip(struct rockchip_spi *rs, int enable)
@@ -449,7 +450,10 @@ static void rockchip_spi_prepare_dma(struct rockchip_spi *rs)
 		rxconf.direction = rs->dma_rx.direction;
 		rxconf.src_addr = rs->dma_rx.addr;
 		rxconf.src_addr_width = rs->n_bytes;
-		rxconf.src_maxburst = rs->n_bytes;
+		if (rs->dma_caps.max_burst > 4)
+			rxconf.src_maxburst = 4;
+		else
+			rxconf.src_maxburst = 1;
 		dmaengine_slave_config(rs->dma_rx.ch, &rxconf);
 
 		rxdesc = dmaengine_prep_slave_sg(
@@ -466,7 +470,10 @@ static void rockchip_spi_prepare_dma(struct rockchip_spi *rs)
 		txconf.direction = rs->dma_tx.direction;
 		txconf.dst_addr = rs->dma_tx.addr;
 		txconf.dst_addr_width = rs->n_bytes;
-		txconf.dst_maxburst = rs->n_bytes;
+		if (rs->dma_caps.max_burst > 4)
+			txconf.dst_maxburst = 4;
+		else
+			txconf.dst_maxburst = 1;
 		dmaengine_slave_config(rs->dma_tx.ch, &txconf);
 
 		txdesc = dmaengine_prep_slave_sg(
@@ -730,6 +737,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
 	}
 
 	if (rs->dma_tx.ch && rs->dma_rx.ch) {
+		dma_get_slave_caps(rs->dma_rx.ch, &(rs->dma_caps));
 		rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
 		rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
 		rs->dma_tx.direction = DMA_MEM_TO_DEV;
-- 
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