lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 287/357] tty/serial: at91: BUG: disable interrupts when !UART_ENABLE_MS()
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Richard Genoud <richard.genoud@gmail.com>

    commit 35b675b9100fc38f58cb75b30e422ecd342519a8 upstream.

    In set_termios(), interrupts where not disabled if UART_ENABLE_MS() was
    false.

    Tested on at91sam9g35.

    Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
    Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/serial/atmel_serial.c | 43 +++++++++++++++++++++++++++++++++++++-
    1 file changed, 42 insertions(+), 1 deletion(-)

    --- 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_
    }

    /*
    + * 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 uar

    /* 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);
    }



    \
     
     \ /
      Last update: 2014-10-04 00:41    [W:3.683 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site