From: Geert Uytterhoeven <geert+renesas@glider.be>
To: linux-sh@vger.kernel.org
Subject: [PATCH 4/4] serial: sh-sci: Stop RX FIFO timer during port shutdown
Date: Fri, 29 Jun 2018 14:25:13 +0000 [thread overview]
Message-ID: <20180629142513.20743-8-geert+renesas@glider.be> (raw)
The RX FIFO timer may be armed when the port is shut down, hence the
timer function may still be called afterwards.
Fix this race condition by deleting the timer during port shutdown.
Fixes: 039403765e5da3c6 ("serial: sh-sci: SCIFA/B RX FIFO software timeout")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Tested with scifa0 on r8a7740/armadillo, after
echo 2000 > /sys/devices/platform/e6c40000.serial/rx_fifo_timeout
---
drivers/tty/serial/sh-sci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 58016386558c6789..cca3bbc62a6b1110 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2571,6 +2571,8 @@ static void sci_shutdown(struct uart_port *port)
}
#endif
+ if (s->rx_trigger > 1 && s->rx_fifo_timeout > 0)
+ del_timer_sync(&s->rx_fifo_timer);
sci_free_irq(s);
sci_free_dma(port);
}
--
2.17.1
next prev reply other threads:[~2018-06-29 14:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-29 14:25 [PATCH 0/3] serial: sh-sci: Fix port shutdown DMA race conditions Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 1/3] serial: sh-sci: Postpone DMA release when falling back to PIO Geert Uytterhoeven
2018-06-29 14:48 ` Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 2/3] serial: sh-sci: Stop TX DMA workqueue during port shutdown Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 3/3] serial: sh-sci: Stop using deprecated dmaengine_terminate_all() Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 1/4] serial: sh-sci: Postpone DMA release when falling back to PIO Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 2/4] serial: sh-sci: Stop using deprecated dmaengine_terminate_all() Geert Uytterhoeven
2018-06-29 14:30 ` Geert Uytterhoeven
2018-06-29 14:25 ` [PATCH 3/4] serial: sh-sci: Stop TX DMA workqueue during port shutdown Geert Uytterhoeven
2018-06-29 14:25 ` Geert Uytterhoeven [this message]
2018-07-01 17:27 ` [PATCH 4/4] serial: sh-sci: Stop RX FIFO timer " Rob Landley
2018-07-02 9:50 ` Geert Uytterhoeven
2018-07-02 19:01 ` Rob Landley
2018-08-03 11:13 ` Geert Uytterhoeven
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=20180629142513.20743-8-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=linux-sh@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).