Skip to contentSkip to conversation

serial: meson: add Magic SysRq support

PATCH In review Yixun Lan 2 participants 4 messages Sep 6, 2017 – Oct 20, 2017

Subsystems (2)
lore
Share & tools
lore

Yixun Lan

author
#0 lore raw

PATCH v2 1/1 serial: meson: add Magic SysRq support

This dirver try to implement the Magic SysRq support[1] for Amlogic Inc's meson platfo

Quoted 1 line

From the hardware perspective, the UART IP can't detect the 'BREAK' command

clearly via the status register. Instead, we rely on the combination of 'FRAME_ERR bit && ch == 0', and it works fine.

[1] Documentation/admin-guide/sysrq.rst

---
Changes since v1 at [0]:
- add changelog & a few more comments

[0] https://patchwork.kernel.org/patch/9728475/

---
 drivers/tty/serial/meson_uart.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/tty/serial/meson_uart.c +16 -2
index 42e4a4c7597f..3fea24bafd80 100644
@@ -14,6 +14,10 @@
  *
  */
 
+#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 +187,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 +220,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);
 
Signature · 1 line
2.14.1
Reviewed-by on v2 1/1
#1 lore raw

Hi Yixun,

Quoted 2 lines · Yixun Lan

This dirver try to implement the Magic SysRq support[1] for Amlogic Inc's meson platfo

Please fix these typos.

Quoted 55 lines

From the hardware perspective, the UART IP can't detect the 'BREAK' command clearly via the status register. Instead, we rely on the combination of 'FRAME_ERR bit && ch == 0', and it works fine.

[1] Documentation/admin-guide/sysrq.rst

---
Changes since v1 at [0]:
- add changelog & a few more comments

[0] https://patchwork.kernel.org/patch/9728475/

---
 drivers/tty/serial/meson_uart.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/tty/serial/meson_uart.c +9 -2
index 42e4a4c7597f..3fea24bafd80 100644
@@ -14,6 +14,10 @@
  *
  */
 
+#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 +187,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 +220,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;

drivers/tty/serial/meson_uart.c static void meson_receive_chars(struct uart_port *port) · line 235

Quoted 10 lines
drivers/tty/serial/meson_uart.c +7 -0
+			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);
 
author
#2 lore raw

Hi Greg-KH

I think you've already accepted this patch (and merged into your git repo)

so, is it possible for you to amend the commit message? or do you want me to send a PATCH v3 then?

Quoted 8 lines · Neil Armstrong

Hi Yixun,

Quoted 2 lines · Yixun Lan

This dirver try to implement the Magic SysRq support[1] for Amlogic Inc's meson platfo

Please fix these typos.

oops, not sure why this line is broken..

s/platfo/platform./
and should squash next line .

Quoted 72 lines
Quoted 55 lines

From the hardware perspective, the UART IP can't detect the 'BREAK' command clearly via the status register. Instead, we rely on the combination of 'FRAME_ERR bit && ch == 0', and it works fine.

[1] Documentation/admin-guide/sysrq.rst

---
Changes since v1 at [0]:
- add changelog & a few more comments

[0] https://patchwork.kernel.org/patch/9728475/

---
 drivers/tty/serial/meson_uart.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/tty/serial/meson_uart.c +9 -2
index 42e4a4c7597f..3fea24bafd80 100644
@@ -14,6 +14,10 @@
  *
  */
 
+#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 +187,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 +220,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;

drivers/tty/serial/meson_uart.c static void meson_receive_chars(struct uart_port *port) · line 235

Quoted 10 lines
drivers/tty/serial/meson_uart.c +7 -0
+			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);
 

_______________________________________________
linux-amlogic mailing list
linux-amlogic at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Signature · 3 lines
Yixun Lan (dlan)
Gentoo Linux Developer
GPG Key ID AABEFD55
#3 lore raw

I Yixun,

Quoted 6 lines · Yixun Lan

Hi Greg-KH

I think you've already accepted this patch (and merged into your git repo)

so, is it possible for you to amend the commit message? or do you want me to send a PATCH v3 then?

I was not aware greg applied it, no need to amen anything, ignore my tag.

Neil

Quoted 88 lines · Neil Armstrong
Quoted 8 lines

Hi Yixun,

Quoted 2 lines · Yixun Lan

This dirver try to implement the Magic SysRq support[1] for Amlogic Inc's meson platfo

Please fix these typos.

oops, not sure why this line is broken..

s/platfo/platform./
and should squash next line .

Quoted 72 lines
Quoted 55 lines

From the hardware perspective, the UART IP can't detect the 'BREAK' command clearly via the status register. Instead, we rely on the combination of 'FRAME_ERR bit && ch == 0', and it works fine.

[1] Documentation/admin-guide/sysrq.rst

---
Changes since v1 at [0]:
- add changelog & a few more comments

[0] https://patchwork.kernel.org/patch/9728475/

---
 drivers/tty/serial/meson_uart.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/tty/serial/meson_uart.c +9 -2
index 42e4a4c7597f..3fea24bafd80 100644
@@ -14,6 +14,10 @@
  *
  */
 
+#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 +187,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 +220,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;

drivers/tty/serial/meson_uart.c static void meson_receive_chars(struct uart_port *port) · line 235

Quoted 10 lines
drivers/tty/serial/meson_uart.c +7 -0
+			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);
 

_______________________________________________
linux-amlogic mailing list
linux-amlogic at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic