From: Geert Uytterhoeven <geert+renesas@glider.be> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.com> Cc: Ulrich Hecht <uli+renesas@fpond.eu>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org, linux-serial@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v3 4/4] serial: sh-sci: Fix fallback to PIO in sci_dma_rx_complete() Date: Mon, 10 Dec 2018 18:21:54 +0000 [thread overview] Message-ID: <20181210182154.20357-5-geert+renesas@glider.be> (raw) In-Reply-To: <20181210182154.20357-1-geert+renesas@glider.be> When submitting a DMA request fails in sci_dma_rx_complete(), the driver tries to fall back to PIO, but that does not work: no more data will be received, or the kernel will even crash. Fix this similar as in (but not identical to) sci_submit_rx(): - On SCIF, PIO cannot take over if any DMA transactions are pending, hence they must be terminated first. - All active cookies must be invalidated, else rx_timer_fn() may trigger a NULL pointer dereference. - Restarting the port is not needed, as it is already running, but serial port interrupts must be directed back from the DMA engine to the CPU. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - Add missing definition of "u16 scr", - Move call to dmaengine_terminate_async() inside the spinlock, for symmetry with sci_submit_rx(), - Split in multiple patches. --- drivers/tty/serial/sh-sci.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d8672336d4ff9b65..946cdb0c7250955f 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1272,6 +1272,8 @@ static void sci_dma_rx_complete(void *arg) struct dma_async_tx_descriptor *desc; unsigned long flags; int active, count = 0; + unsigned int i; + u16 scr; dev_dbg(port->dev, "%s(%d) active cookie %d\n", __func__, port->line, s->active_rx); @@ -1313,8 +1315,18 @@ static void sci_dma_rx_complete(void *arg) dev_warn(port->dev, "Failed submitting Rx DMA descriptor\n"); /* Switch to PIO */ spin_lock_irqsave(&port->lock, flags); + dmaengine_terminate_async(chan); + for (i = 0; i < 2; i++) + s->cookie_rx[i] = -EINVAL; + s->active_rx = 0; s->chan_rx = NULL; - sci_start_rx(port); + /* Direct new serial port interrupts back to CPU */ + scr = serial_port_in(port, SCSCR); + if (port->type = PORT_SCIFA || port->type = PORT_SCIFB) { + scr &= ~SCSCR_RDRQE; + enable_irq(s->irqs[SCIx_RXI_IRQ]); + } + serial_port_out(port, SCSCR, scr | SCSCR_RIE); spin_unlock_irqrestore(&port->lock, flags); } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas@glider.be> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.com> Cc: Ulrich Hecht <uli+renesas@fpond.eu>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org, linux-serial@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v3 4/4] serial: sh-sci: Fix fallback to PIO in sci_dma_rx_complete() Date: Mon, 10 Dec 2018 19:21:54 +0100 [thread overview] Message-ID: <20181210182154.20357-5-geert+renesas@glider.be> (raw) In-Reply-To: <20181210182154.20357-1-geert+renesas@glider.be> When submitting a DMA request fails in sci_dma_rx_complete(), the driver tries to fall back to PIO, but that does not work: no more data will be received, or the kernel will even crash. Fix this similar as in (but not identical to) sci_submit_rx(): - On SCIF, PIO cannot take over if any DMA transactions are pending, hence they must be terminated first. - All active cookies must be invalidated, else rx_timer_fn() may trigger a NULL pointer dereference. - Restarting the port is not needed, as it is already running, but serial port interrupts must be directed back from the DMA engine to the CPU. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - Add missing definition of "u16 scr", - Move call to dmaengine_terminate_async() inside the spinlock, for symmetry with sci_submit_rx(), - Split in multiple patches. --- drivers/tty/serial/sh-sci.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d8672336d4ff9b65..946cdb0c7250955f 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1272,6 +1272,8 @@ static void sci_dma_rx_complete(void *arg) struct dma_async_tx_descriptor *desc; unsigned long flags; int active, count = 0; + unsigned int i; + u16 scr; dev_dbg(port->dev, "%s(%d) active cookie %d\n", __func__, port->line, s->active_rx); @@ -1313,8 +1315,18 @@ static void sci_dma_rx_complete(void *arg) dev_warn(port->dev, "Failed submitting Rx DMA descriptor\n"); /* Switch to PIO */ spin_lock_irqsave(&port->lock, flags); + dmaengine_terminate_async(chan); + for (i = 0; i < 2; i++) + s->cookie_rx[i] = -EINVAL; + s->active_rx = 0; s->chan_rx = NULL; - sci_start_rx(port); + /* Direct new serial port interrupts back to CPU */ + scr = serial_port_in(port, SCSCR); + if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) { + scr &= ~SCSCR_RDRQE; + enable_irq(s->irqs[SCIx_RXI_IRQ]); + } + serial_port_out(port, SCSCR, scr | SCSCR_RIE); spin_unlock_irqrestore(&port->lock, flags); } -- 2.17.1
next prev parent reply other threads:[~2018-12-10 18:21 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-10 18:21 [PATCH v3 0/4] serial: sh-sci: Fix fallback to PIO on DMA failure Geert Uytterhoeven 2018-12-10 18:21 ` Geert Uytterhoeven 2018-12-10 18:21 ` [PATCH v3 1/4] serial: sh-sci: Fix locking in sci_submit_rx() Geert Uytterhoeven 2018-12-10 18:21 ` Geert Uytterhoeven 2018-12-10 18:21 ` [PATCH v3 2/4] serial: sh-sci: Fix crash in rx_timer_fn() on PIO fallback Geert Uytterhoeven 2018-12-10 18:21 ` Geert Uytterhoeven 2018-12-10 18:21 ` [PATCH v3 3/4] serial: sh-sci: Resume PIO in sci_rx_interrupt() on DMA failure Geert Uytterhoeven 2018-12-10 18:21 ` Geert Uytterhoeven 2018-12-10 19:00 ` Wolfram Sang 2018-12-10 19:00 ` Wolfram Sang 2018-12-11 8:16 ` Geert Uytterhoeven 2018-12-11 8:16 ` Geert Uytterhoeven 2018-12-10 18:21 ` Geert Uytterhoeven [this message] 2018-12-10 18:21 ` [PATCH v3 4/4] serial: sh-sci: Fix fallback to PIO in sci_dma_rx_complete() 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=20181210182154.20357-5-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=gregkh@linuxfoundation.org \ --cc=jslaby@suse.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=uli+renesas@fpond.eu \ --cc=wsa+renesas@sang-engineering.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ --cc=ysato@users.sourceforge.jp \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.