1 files changed, 18 insertions, 13 deletions

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index 07c0f98be3ac..daafe60175da 100644
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -1,19 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Based on meson_uart.c, by AMLOGIC, INC.
  *
  * Copyright (C) 2014 Carlo Caione <carlo@caione.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
+#if defined(CONFIG_SERIAL_MESON_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
 #include <linux/clk.h>
 #include <linux/console.h>
 #include <linux/delay.h>
@@ -183,12 +178,12 @@ static void meson_receive_chars(struct uart_port *port)
 {
         struct tty_port *tport = &port->state->port;
         char flag;
-        u32 status, ch, mode;
+        u32 ostatus, status, ch, mode;
 
         do {
                 flag = TTY_NORMAL;
                 port->icount.rx++;
-                status = readl(port->membase + AML_UART_STATUS);
+                ostatus = status = readl(port->membase + AML_UART_STATUS);
 
                 if (status & AML_UART_ERR) {
                         if (status & AML_UART_TX_FIFO_WERR)
@@ -216,6 +211,16 @@ static void meson_receive_chars(struct uart_port *port)
                 ch = readl(port->membase + AML_UART_RFIFO);
                 ch &= 0xff;
 
+                if ((ostatus & AML_UART_FRAME_ERR) && (ch == 0)) {
+                        port->icount.brk++;
+                        flag = TTY_BREAK;
+                        if (uart_handle_break(port))
+                                continue;
+                }
+
+                if (uart_handle_sysrq_char(port, ch))
+                        continue;
+
                 if ((status & port->ignore_status_mask) == 0)
                         tty_insert_flip_char(tport, ch, flag);
 
@@ -362,7 +367,7 @@ static void meson_uart_set_termios(struct uart_port *port,
 
         writel(val, port->membase + AML_UART_CONTROL);
 
-        baud = uart_get_baud_rate(port, termios, old, 9600, 4000000);
+        baud = uart_get_baud_rate(port, termios, old, 50, 4000000);
         meson_uart_change_speed(port, baud);
 
         port->read_status_mask = AML_UART_TX_FIFO_WERR;