projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9382df0
)
spi: rockchip: terminate dma transmission when slave abort
author
Jon Lin
<jon.lin@rock-chips.com>
Wed, 16 Feb 2022 01:40:24 +0000
(09:40 +0800)
committer
Mark Brown
<broonie@kernel.org>
Thu, 17 Feb 2022 15:33:18 +0000
(15:33 +0000)
After slave abort, all DMA should be stopped, or it will affect the
next transmission and maybe abort again.
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Link:
https://lore.kernel.org/r/20220216014028.8123-3-jon.lin@rock-chips.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-rockchip.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-rockchip.c
b/drivers/spi/spi-rockchip.c
index
4f65ba3
..
c6a1bb0
100644
(file)
--- a/
drivers/spi/spi-rockchip.c
+++ b/
drivers/spi/spi-rockchip.c
@@
-585,6
+585,12
@@
static int rockchip_spi_slave_abort(struct spi_controller *ctlr)
{
struct rockchip_spi *rs = spi_controller_get_devdata(ctlr);
+ if (atomic_read(&rs->state) & RXDMA)
+ dmaengine_terminate_sync(ctlr->dma_rx);
+ if (atomic_read(&rs->state) & TXDMA)
+ dmaengine_terminate_sync(ctlr->dma_tx);
+ atomic_set(&rs->state, 0);
+ spi_enable_chip(rs, false);
rs->slave_abort = true;
spi_finalize_current_transfer(ctlr);