Skip to contentSkip to conversation

spi: mediatek: Fix fifo transfer

PATCH In review Guenter Roeck 4 participants 5 messages Aug 2, 2021 – Aug 3, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: mediatek: Fix fifo transfer

Commit 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode") claims that fifo RX mode was never handled, and adds the presumably missing code to the FIFO transfer function. However, the claim that receive data was not handled is incorrect. It was handled as part of interrupt handling after the transfer was complete. The code added with the above mentioned commit reads data from the receive FIFO before the transfer is started, which is wrong. This results in an actual transfer error on a Hayato Chromebook.

Remove the code trying to handle receive data before the transfer is started to fix the problem.

Fixes 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode")
Cc Peter Hess <[email protected]>
Cc Frank Wunderlich <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Hsin-Yi Wang <[email protected]>
---
 drivers/spi/spi-mt65xx.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
drivers/spi/spi-mt65xx.c +5 -14
index 68dca8ceb3ad..7914255521c3 100644
@@ -426,24 +426,15 @@ static int mtk_spi_fifo_transfer(struct spi_master *master,
 	mtk_spi_prepare_transfer(master, xfer);
 	mtk_spi_setup_packet(master);
 
-	cnt = xfer->len / 4;
-	if (xfer->tx_buf)
+	if (xfer->tx_buf) {
+		cnt = xfer->len / 4;
 		iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
-
-	if (xfer->rx_buf)
-		ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
-
-	remainder = xfer->len % 4;
-	if (remainder > 0) {
-		reg_val = 0;
-		if (xfer->tx_buf) {
+		remainder = xfer->len % 4;
+		if (remainder > 0) {
+			reg_val = 0;
 			memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
 			writel(reg_val, mdata->base + SPI_TX_DATA_REG);
 		}
-		if (xfer->rx_buf) {
-			reg_val = readl(mdata->base + SPI_RX_DATA_REG);
-			memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
-		}
 	}
 
 	mtk_spi_enable_transfer(master);
Signature · 1 line
2.25.1
Tested-by
#2 lore raw
Quoted 10 lines · Tzung-Bi Shih
Quoted 6 lines · Guenter Roeck
Fixes 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode")
Cc Peter Hess <[email protected]>
Cc Frank Wunderlich <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Hsin-Yi Wang <[email protected]>

tested on a mt8183 device.

Quoted 5 lines

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#3 lore raw
In reply to Guenter Roeck
Quoted 12 lines · Guenter Roeck

Commit 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode") claims that fifo RX mode was never handled, and adds the presumably missing code to the FIFO transfer function. However, the claim that receive data was not handled is incorrect. It was handled as part of interrupt handling after the transfer was complete. The code added with the above mentioned commit reads data from the receive FIFO before the transfer is started, which is wrong. This results in an actual transfer error on a Hayato Chromebook.

Remove the code trying to handle receive data before the transfer is started to fix the problem.

Quoted 7 lines
Fixes 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode")
Cc Peter Hess <[email protected]>
Cc Frank Wunderlich <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Hsin-Yi Wang <[email protected]>

---

I should have added here: If this patch isn't acceptable for some reason, commit 3a70dd2d0503 should be reverted because it is obviously wrong and introduces a severe regression.

Thanks,
Guenter

Quoted 28 lines
  drivers/spi/spi-mt65xx.c | 19 +++++--------------
  1 file changed, 5 insertions(+), 14 deletions(-)
drivers/spi/spi-mt65xx.c +5 -10
index 68dca8ceb3ad..7914255521c3 100644
@@ -426,24 +426,15 @@ static int mtk_spi_fifo_transfer(struct spi_master *master,
  	mtk_spi_prepare_transfer(master, xfer);
  	mtk_spi_setup_packet(master);
 
-	cnt = xfer->len / 4;
-	if (xfer->tx_buf)
+	if (xfer->tx_buf) {
+		cnt = xfer->len / 4;
  		iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
-
-	if (xfer->rx_buf)
-		ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
-
-	remainder = xfer->len % 4;
-	if (remainder > 0) {
-		reg_val = 0;
-		if (xfer->tx_buf) {
+		remainder = xfer->len % 4;
+		if (remainder > 0) {
+			reg_val = 0;

drivers/spi/spi-mt65xx.c static int mtk_spi_fifo_transfer(struct spi_master *master, · line 440

Quoted 10 lines
drivers/spi/spi-mt65xx.c +0 -4
  			memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
  			writel(reg_val, mdata->base + SPI_TX_DATA_REG);
  		}
-		if (xfer->rx_buf) {
-			reg_val = readl(mdata->base + SPI_RX_DATA_REG);
-			memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
-		}
  	}
 
  	mtk_spi_enable_transfer(master);

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#4 lore raw
In reply to Guenter Roeck
Quoted 10 lines · Guenter Roeck

Commit 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode") claims that fifo RX mode was never handled, and adds the presumably missing code to the FIFO transfer function. However, the claim that receive data was not handled is incorrect. It was handled as part of interrupt handling after the transfer was complete. The code added with the above mentioned commit reads data from the receive FIFO before the transfer is started, which is wrong. This results in an actual transfer error on a Hayato Chromebook.

[...]

Applied to

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

Thanks!

[1/1] spi: mediatek: Fix fifo transfer

      commit: 0d5c3954b35eddff0da0436c31e8d721eceb7dc2

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