linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>,
	Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
	Ulrich Hecht <ulrich.hecht+renesas@gmail.com>,
	Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-serial@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
	linux-sh@vger.kernel.org,
	Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 3/4] serial: sh-sci: Stop TX DMA workqueue during port shutdown
Date: Fri, 29 Jun 2018 14:25:12 +0000	[thread overview]
Message-ID: <20180629142513.20743-7-geert+renesas@glider.be> (raw)
In-Reply-To: <20180629142513.20743-1-geert+renesas@glider.be>

The transmit DMA workqueue is never stopped, hence the work function may
be called after the port has been shut down.

Fix this race condition by cancelling queued work, if any, before DMA
release.  Don't initialize the work if DMA initialization failed, as it
won't be used anyway.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/tty/serial/sh-sci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 061660ccf9442d02..58016386558c6789 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1704,6 +1704,7 @@ static void sci_tx_dma_release(struct sci_port *s)
 	struct dma_chan *chan = s->chan_tx_saved;
 	struct uart_port *port = &s->port;
 
+	cancel_work_sync(&s->work_tx);
 dev_dbg_dma(port->dev, "%s\n", __func__);
 	s->chan_tx_saved = s->chan_tx = NULL;
 	s->cookie_tx = -EINVAL;
@@ -1978,10 +1979,9 @@ static void sci_request_dma(struct uart_port *port)
 				UART_XMIT_SIZE,
 				port->state->xmit.buf, &s->tx_dma_addr);
 
+			INIT_WORK(&s->work_tx, work_fn_tx);
 			s->chan_tx_saved = s->chan_tx = chan;
 		}
-
-		INIT_WORK(&s->work_tx, work_fn_tx);
 	}
 
 	chan = sci_request_dma_chan(port, DMA_DEV_TO_MEM);
-- 
2.17.1


  parent 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 ` Geert Uytterhoeven [this message]
2018-06-29 14:25 ` [PATCH 4/4] serial: sh-sci: Stop RX FIFO timer during port shutdown Geert Uytterhoeven
2018-07-01 17:27   ` 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-7-geert+renesas@glider.be \
    --to=geert+renesas@glider.be \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=laurent.pinchart+renesas@ideasonboard.com \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=ulrich.hecht+renesas@gmail.com \
    --cc=wsa+renesas@sang-engineering.com \
    /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).