From: peter@hurleysoftware.com (Peter Hurley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] tty/serial: at91: BUG: disable interrupts when !UART_ENABLE_MS()
Date: Thu, 04 Sep 2014 11:47:17 -0400 [thread overview]
Message-ID: <54088985.80102@hurleysoftware.com> (raw)
In-Reply-To: <1409760567-13186-1-git-send-email-richard.genoud@gmail.com>
On 09/03/2014 12:09 PM, Richard Genoud wrote:
> In set_termios(), interrupts where not disabled if UART_ENABLE_MS() was
> false.
>
> Tested on at91sam9g35.
>
> CC: stable at vger.kernel.org # >= 3.16
Awesome, thank you.
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
> Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
> ---
> drivers/tty/serial/atmel_serial.c | 43 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 7b63677475c1..d7d4584549a5 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -527,6 +527,45 @@ static void atmel_enable_ms(struct uart_port *port)
> }
>
> /*
> + * Disable modem status interrupts
> + */
> +static void atmel_disable_ms(struct uart_port *port)
> +{
> + struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
> + uint32_t idr = 0;
> +
> + /*
> + * Interrupt should not be disabled twice
> + */
> + if (!atmel_port->ms_irq_enabled)
> + return;
> +
> + atmel_port->ms_irq_enabled = false;
> +
> + if (atmel_port->gpio_irq[UART_GPIO_CTS] >= 0)
> + disable_irq(atmel_port->gpio_irq[UART_GPIO_CTS]);
> + else
> + idr |= ATMEL_US_CTSIC;
> +
> + if (atmel_port->gpio_irq[UART_GPIO_DSR] >= 0)
> + disable_irq(atmel_port->gpio_irq[UART_GPIO_DSR]);
> + else
> + idr |= ATMEL_US_DSRIC;
> +
> + if (atmel_port->gpio_irq[UART_GPIO_RI] >= 0)
> + disable_irq(atmel_port->gpio_irq[UART_GPIO_RI]);
> + else
> + idr |= ATMEL_US_RIIC;
> +
> + if (atmel_port->gpio_irq[UART_GPIO_DCD] >= 0)
> + disable_irq(atmel_port->gpio_irq[UART_GPIO_DCD]);
> + else
> + idr |= ATMEL_US_DCDIC;
> +
> + UART_PUT_IDR(port, idr);
> +}
> +
> +/*
> * Control the transmission of a break signal
> */
> static void atmel_break_ctl(struct uart_port *port, int break_state)
> @@ -1993,7 +2032,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
>
> /* CTS flow-control and modem-status interrupts */
> if (UART_ENABLE_MS(port, termios->c_cflag))
> - port->ops->enable_ms(port);
> + atmel_enable_ms(port);
> + else
> + atmel_disable_ms(port);
>
> spin_unlock_irqrestore(&port->lock, flags);
> }
>
next prev parent reply other threads:[~2014-09-04 15:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 16:09 [PATCH] tty/serial: at91: BUG: disable interrupts when !UART_ENABLE_MS() Richard Genoud
2014-09-04 15:47 ` Peter Hurley [this message]
2014-09-05 9:15 ` Nicolas Ferre
2014-09-05 11:06 ` Peter Hurley
2014-09-05 12:48 ` Nicolas Ferre
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=54088985.80102@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=linux-arm-kernel@lists.infradead.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).