From: Jon Lin <jon.lin@rock-chips.com>
To: broonie@kernel.org
Cc: heiko@sntech.de, linux-spi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Jon Lin <jon.lin@rock-chips.com>
Subject: [PATCH v2 2/6] spi: rockchip: terminate dma transmission when slave abort
Date: Mon, 14 Feb 2022 16:43:35 +0800 [thread overview]
Message-ID: <20220214084339.18996-3-jon.lin@rock-chips.com> (raw)
In-Reply-To: <20220214084339.18996-1-jon.lin@rock-chips.com>
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>
---
Changes in v2:
- Fix patches should be at the start of the series
- Delete useless messages
Changes in v1: None
drivers/spi/spi-rockchip.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 4f65ba3dd19c..c6a1bb09be05 100644
--- 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);
--
2.17.1
next prev parent reply other threads:[~2022-02-14 8:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 8:43 [PATCH v2 0/6] New support and problem adjustment of SPI rockchip Jon Lin
2022-02-14 8:43 ` [PATCH v2 1/6] spi: rockchip: Fix error in getting num-cs property Jon Lin
2022-02-14 8:43 ` Jon Lin [this message]
2022-02-14 8:43 ` [PATCH v2 3/6] spi: rockchip: Stop spi slave dma receiver when cs inactive Jon Lin
2022-02-14 8:43 ` [PATCH v2 4/6] spi: rockchip: Preset cs-high and clk polarity in setup progress Jon Lin
2022-02-14 8:43 ` [PATCH v2 5/6] spi: rockchip: Suspend and resume the bus during NOIRQ_SYSTEM_SLEEP_PM ops Jon Lin
2022-02-14 8:43 ` [PATCH v2 6/6] spi: rockchip: clear interrupt status in error handler Jon Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220214084339.18996-3-jon.lin@rock-chips.com \
--to=jon.lin@rock-chips.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®