lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 176/244] Revert "serial: core: Refactor uart_unlock_and_check_sysrq()"
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 10652a9e9fe3fbcaca090f99cd3060ac3fee2913 upstream.

    This reverts commit da9a5aa3402db0ff3b57216d8dbf2478e1046cae.

    In order to ease backporting a fix for a sysrq regression, revert this
    rewrite which was since added on top.

    The other sysrq helpers now bail out early when sysrq is not enabled;
    it's better to keep that pattern here as well.

    Note that the __releases() attribute won't be needed after the follow-on
    fix either.

    Fixes: da9a5aa3402d ("serial: core: Refactor uart_unlock_and_check_sysrq()")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Link: https://lore.kernel.org/r/20200610152232.16925-2-johan@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/serial/serial_core.c | 23 +++++++++++++----------
    include/linux/serial_core.h | 3 ++-
    2 files changed, 15 insertions(+), 11 deletions(-)

    --- a/drivers/tty/serial/serial_core.c
    +++ b/drivers/tty/serial/serial_core.c
    @@ -3251,19 +3251,22 @@ int uart_prepare_sysrq_char(struct uart_
    }
    EXPORT_SYMBOL_GPL(uart_prepare_sysrq_char);

    -void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long flags)
    -__releases(&port->lock)
    +void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags)
    {
    - if (port->has_sysrq) {
    - int sysrq_ch = port->sysrq_ch;
    + int sysrq_ch;

    - port->sysrq_ch = 0;
    - spin_unlock_irqrestore(&port->lock, flags);
    - if (sysrq_ch)
    - handle_sysrq(sysrq_ch);
    - } else {
    - spin_unlock_irqrestore(&port->lock, flags);
    + if (!port->has_sysrq) {
    + spin_unlock_irqrestore(&port->lock, irqflags);
    + return;
    }
    +
    + sysrq_ch = port->sysrq_ch;
    + port->sysrq_ch = 0;
    +
    + spin_unlock_irqrestore(&port->lock, irqflags);
    +
    + if (sysrq_ch)
    + handle_sysrq(sysrq_ch);
    }
    EXPORT_SYMBOL_GPL(uart_unlock_and_check_sysrq);

    --- a/include/linux/serial_core.h
    +++ b/include/linux/serial_core.h
    @@ -462,7 +462,8 @@ extern void uart_insert_char(struct uart

    extern int uart_handle_sysrq_char(struct uart_port *port, unsigned int ch);
    extern int uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch);
    -extern void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long flags);
    +extern void uart_unlock_and_check_sysrq(struct uart_port *port,
    + unsigned long irqflags);
    extern int uart_handle_break(struct uart_port *port);

    /*

    \
     
     \ /
      Last update: 2020-07-20 18:15    [W:4.631 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site