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 5/6] spi: rockchip: terminate dma transmission when slave abort
Date: Fri, 11 Feb 2022 11:43:42 +0800 [thread overview]
Message-ID: <20220211034344.4130-6-jon.lin@rock-chips.com> (raw)
In-Reply-To: <20220211034344.4130-1-jon.lin@rock-chips.com>
After slave abort, all DMA should be stopped, or it will affect the
next transmission:
[ 31.693877] Unable to handle kernel paging request at virtual address ffffff8105a2a7c0
[ 31.694643] Mem abort info:
[ 31.694898] ESR = 0x96000045
[ 31.695179] EC = 0x25: DABT (current EL), IL = 32 bits
[ 31.695653] SET = 0, FnV = 0
[ 31.695931] EA = 0, S1PTW = 0
[ 31.696218] Data abort info:
[ 31.696485] ISV = 0, ISS = 0x00000045
[ 31.696832] CM = 0, WnR = 1
[ 31.697112] swapper pgtable: 4k pages, 39-bit VAs, pgdp=000000000142f000
[ 31.697713] [ffffff8105a2a7c0] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
[ 31.698502] Internal error: Oops: 96000045 [#1] SMP
[ 31.698943] Modules linked in:
[ 31.699235] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 5.10.43 #8
[ 31.699895] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[ 31.700455] pstate: 60400089 (nZCv daIf +PAN -UAO -TCO BTYPE=--)
[ 31.701000] pc : rockchip_spi_slave_abort+0x150/0x18c
[ 31.701456] lr : rockchip_spi_slave_abort+0x78/0x18c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
---
drivers/spi/spi-rockchip.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 5457af616a44..3d4e95eda4a6 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -617,8 +617,6 @@ static int rockchip_spi_slave_abort(struct spi_controller *ctlr)
if (atomic_read(&rs->state) & RXDMA) {
dmaengine_pause(ctlr->dma_rx);
status = dmaengine_tx_status(ctlr->dma_rx, ctlr->dma_rx->cookie, &state);
- dmaengine_terminate_sync(ctlr->dma_rx);
- atomic_set(&rs->state, 0);
if (status == DMA_ERROR) {
rs->rx = rs->xfer->rx_buf;
rs->xfer->len = 0;
@@ -648,6 +646,11 @@ static int rockchip_spi_slave_abort(struct spi_controller *ctlr)
}
out:
+ 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-11 3:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 3:43 [PATCH 1/6] spi: rockchip: Stop spi slave dma receiver when cs inactive Jon Lin
2022-02-11 3:43 ` [PATCH 2/6] spi: rockchip: Preset cs-high and clk polarity in setup progress Jon Lin
2022-02-11 11:24 ` Mark Brown
[not found] ` <4222ce7d-a1e3-1728-fec2-976946b06ba9@rock-chips.com>
2022-02-14 12:49 ` Mark Brown
[not found] ` <e0f0ca0d-40df-cf86-9471-9272bcc171f9@rock-chips.com>
2022-02-15 12:36 ` Mark Brown
2022-02-16 1:23 ` Jon Lin
2022-02-11 3:43 ` [PATCH 3/6] spi: rockchip: Fix error in getting num-cs property Jon Lin
2022-02-11 11:25 ` Mark Brown
2022-02-11 3:43 ` [PATCH 4/6] spi: rockchip: Suspend and resume the bus during NOIRQ_SYSTEM_SLEEP_PM ops Jon Lin
2022-02-11 3:43 ` [PATCH v10 5/6] spi: rockchip: Support cs-gpio Jon Lin
2022-02-11 11:48 ` Mark Brown
2022-02-11 3:43 ` Jon Lin [this message]
2022-02-11 11:49 ` [PATCH 5/6] spi: rockchip: terminate dma transmission when slave abort Mark Brown
2022-02-11 3:43 ` [PATCH 6/6] spi: rockchip: clear interrupt status in error handler Jon Lin
2022-02-11 3:43 ` [PATCH v10 6/6] spi: rockchip: Support SPI_CS_HIGH 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=20220211034344.4130-6-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;
as well as URLs for NNTP newsgroup(s).