Skip to content

Commit 3a70dd2

Browse files
phess49broonie
authored andcommitted
spi: mediatek: fix fifo rx mode
In FIFO mode were two problems: - RX mode was never handled and - in this case the tx_buf pointer was NULL and caused an exception fix this by handling RX mode in mtk_spi_fifo_transfer Fixes: a568231 ("spi: mediatek: Add spi bus for Mediatek MT8173") Signed-off-by: Peter Hess <[email protected]> Signed-off-by: Frank Wunderlich <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 69e1818 commit 3a70dd2

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

drivers/spi/spi-mt65xx.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,13 +427,23 @@ static int mtk_spi_fifo_transfer(struct spi_master *master,
427427
mtk_spi_setup_packet(master);
428428

429429
cnt = xfer->len / 4;
430-
iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
430+
if (xfer->tx_buf)
431+
iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
432+
433+
if (xfer->rx_buf)
434+
ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
431435

432436
remainder = xfer->len % 4;
433437
if (remainder > 0) {
434438
reg_val = 0;
435-
memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
436-
writel(reg_val, mdata->base + SPI_TX_DATA_REG);
439+
if (xfer->tx_buf) {
440+
memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
441+
writel(reg_val, mdata->base + SPI_TX_DATA_REG);
442+
}
443+
if (xfer->rx_buf) {
444+
reg_val = readl(mdata->base + SPI_RX_DATA_REG);
445+
memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
446+
}
437447
}
438448

439449
mtk_spi_enable_transfer(master);

0 commit comments

Comments
 (0)