Skip to contentSkip to conversation

spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch

PATCH In review Vignesh R 3 participants 3 messages Jan 15, 2019

Subsystems (2)
lore
Share & tools
lore

Vignesh R

author
#0 lore raw

PATCH 1/1 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch

Commit b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length") broke SPI transfers where bits_per_word != 8. This is because of mimsatch between McSPI FIFO level event trigger size (SPI word length) and DMA request size(word length * maxburst). This leads to data corruption, lockup and errors like:

spi1.0: EOW timed out

Fix this by setting DMA maxburst size to 1 so that McSPI FIFO level event trigger size matches DMA request size.

Fixes b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length")
---
 drivers/spi/spi-omap2-mcspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +2 -2
index 2fd8881fcd65..8be304379628 100644
@@ -623,8 +623,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
 	cfg.dst_addr = cs->phys + OMAP2_MCSPI_TX0;
 	cfg.src_addr_width = width;
 	cfg.dst_addr_width = width;
-	cfg.src_maxburst = es;
-	cfg.dst_maxburst = es;
+	cfg.src_maxburst = 1;
+	cfg.dst_maxburst = 1;
 
 	rx = xfer->rx_buf;
 	tx = xfer->tx_buf;
Signature · 1 line
2.20.1
#1 lore raw
Quoted 26 lines · Vignesh R

Commit b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length") broke SPI transfers where bits_per_word != 8. This is because of mimsatch between McSPI FIFO level event trigger size (SPI word length) and DMA request size(word length * maxburst). This leads to data corruption, lockup and errors like:

spi1.0: EOW timed out

Fix this by setting DMA maxburst size to 1 so that McSPI FIFO level event trigger size matches DMA request size.

Fixes b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length")
---
  drivers/spi/spi-omap2-mcspi.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +0 -0
index 2fd8881fcd65..8be304379628 100644

drivers/spi/spi-omap2-mcspi.c omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) · line 630

Quoted 10 lines
drivers/spi/spi-omap2-mcspi.c +2 -2
@@ -623,8 +623,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
  	cfg.dst_addr = cs->phys + OMAP2_MCSPI_TX0;
  	cfg.src_addr_width = width;
  	cfg.dst_addr_width = width;
-	cfg.src_maxburst = es;
-	cfg.dst_maxburst = es;
+	cfg.src_maxburst = 1;
+	cfg.dst_maxburst = 1;
 
  	rx = xfer->rx_buf;
  	tx = xfer->tx_buf;

Works for me.

maintainer
#2 lore raw

Applied "spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch" to the spi tree

In reply to Vignesh R

The patch

spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch

has been applied to the spi tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From baf8b9f8d260c55a86405f70a384c29cda888476 Mon Sep 17 00:00:00 2001

From: Vignesh R <[email protected]>
Date: Tue, 15 Jan 2019 12:28:32 +0530
Subject: [PATCH] spi: omap2-mcspi: Fix DMA and FIFO event trigger size
mismatch

Commit b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length") broke SPI transfers where bits_per_word != 8. This is because of mimsatch between McSPI FIFO level event trigger size (SPI word length) and DMA request size(word length * maxburst). This leads to data corruption, lockup and errors like:

spi1.0: EOW timed out

Fix this by setting DMA maxburst size to 1 so that McSPI FIFO level event trigger size matches DMA request size.

Fixes b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length")
---
 drivers/spi/spi-omap2-mcspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +2 -2
index 2fd8881fcd65..8be304379628 100644
@@ -623,8 +623,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
 	cfg.dst_addr = cs->phys + OMAP2_MCSPI_TX0;
 	cfg.src_addr_width = width;
 	cfg.dst_addr_width = width;
-	cfg.src_maxburst = es;
-	cfg.dst_maxburst = es;
+	cfg.src_maxburst = 1;
+	cfg.dst_maxburst = 1;
 
 	rx = xfer->rx_buf;
 	tx = xfer->tx_buf;
Signature · 1 line
2.20.1