8250: add workaround for MPC8[356]xx UART break IRQ storm
PATCH 1/1 8250: add workaround for MPC8[356]xx UART break IRQ storm
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (/proc/interrupts typically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.
---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)
drivers/serial/8250.c +6 -0
@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up) status =serial_inp (up,UART_LSR ); +if ((up->bugs &UART_BUG_PPC ) && (status ==UART_LSR_RFE_ERROR_BITS )) { +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + } +DEBUG_INTR ("status = %x..." , status);if (status & (UART_LSR_DR |UART_LSR_BI ))
@@ -1948,6 +1953,7 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr =0 ; + up->bugs |=UART_KNOWN_BUGS ;if (up->port.iotype != up->cur_iotype)set_io_from_upio (port);
drivers/serial/8250.h +20 -0
@@ -49,6 +49,7 @@ struct serial8250_config {#define UART_BUG_TXEN (1 << 1)/* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1 << 3)/* UART has buggy THRE reassertion */ +#define UART_BUG_PPC (1 << 4)/* UART has buggy PPC break IRQ storm */ #define PROBE_RSA (1 << 0)#define PROBE_ANY (~0)
@@ -78,3 +79,22 @@ struct serial8250_config {#else #define ALPHA_KLUDGE_MCR 0#endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to enable */ +#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR | \ + HAS_BUG_THRE | HAS_BUG_PPC) +
drivers/serial/Kconfig +14 -0
@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLE If unsure, say N. +config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a break" + depends on SERIAL_8250 && PPC32 + ---help--- + If you say Y here, addional checks will be added in the handling of + interrupts on the serial ports which will prevent ill effects of + an interrupt storm triggered by a break on the serial line. Without + this enabled, a Sysrq via the serial console can be unusable on + some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based boards. + + If unsure, say N. + config FIX_EARLYCON_MEM bool depends on X86
include/linux/serial_reg.h +2 -0
@@ -111,6 +111,7 @@#define UART_MCR_DTR 0x01/* DTR complement */ #define UART_LSR 5/* In: Line Status Register */ +#define UART_LSR_RFE 0x80/* Rx FIFO Error (BE, FE, or PE) */ #define UART_LSR_TEMT 0x40/* Transmitter empty */ #define UART_LSR_THRE 0x20/* Transmit-hold-register empty */ #define UART_LSR_BI 0x10/* Break interrupt indicator */
@@ -119,6 +120,7 @@#define UART_LSR_OE 0x02/* Overrun error indicator */ #define UART_LSR_DR 0x01/* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E/* BI, FE, PE, OE bits */ +#define UART_LSR_RFE_ERROR_BITS 0xF1/* RFE, TEMT, THRE, BI, DR bits */ #define UART_MSR 6/* In: Modem Status Register */ #define UART_MSR_DCD 0x80/* Data Carrier Detect */
Signature · 1 line
1.6.5.2
drivers/serial/8250.c static void serial8250_handle_port(struct =
Quoted 27 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here. =20Signed-off-by Paul Gortmaker <[email protected]>---
=20
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
=20drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)=20
drivers/serial/8250.c +0
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct =
uart_8250_port *up)
drivers/serial/8250.c
Quoted 4 lines
=20
status =3D serial_inp(up, UART_LSR);=20
drivers/serial/8250.c +1
-0+ if ((up->bugs & UART_BUG_PPC) && (status =3D=3D =
UART_LSR_RFE_ERROR_BITS)) {
drivers/serial/8250.c static int serial8250_startup(struct uart_port =
Quoted 8 lines
drivers/serial/8250.c +4
-0+spin_unlock_irqrestore (&up->port.lock, flags); +return ; + } +DEBUG_INTR("status =3D %x...", status);=20
if (status & (UART_LSR_DR|UART_LSR_BI))drivers/serial/8250.c +0
-0@@ -1948,6 +1953,7 @@ static int serial8250_startup(struct uart_port =
*port)
drivers/serial/8250.h struct serial8250_config { · line 49
Quoted 13 lines
=20
up->capabilities =3D uart_config[up->port.type].flags; up->mcr =3D 0;drivers/serial/8250.c +1
-0+ up->bugs |=3D UART_KNOWN_BUGS;=20
if (up->port.iotype !=3D up->cur_iotype) set_io_from_upio(port);drivers/serial/8250.h +0
-0@@ -49,6 +49,7 @@ struct serial8250_config {#define UART_BUG_TXEN (1 << 1)/* UART has buggy TX IIR status =
*/
drivers/serial/8250.h struct serial8250_config { · line 50
Quoted 1 line
drivers/serial/8250.h +0
-0#define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR =
status bits (Au1x00) */
drivers/serial/8250.h struct serial8250_config { · line 51
Quoted 1 line
drivers/serial/8250.h +0
-0#define UART_BUG_THRE (1 << 3)/* UART has buggy THRE =
reassertion */
drivers/serial/8250.h struct serial8250_config { · line 52
Quoted 1 line
drivers/serial/8250.h +1
-0+#define UART_BUG_PPC (1 << 4)/* UART has buggy PPC break IRQ =
storm */
Quoted 5 lines
=20
#definePROBE_RSA(1 << 0)
#definePROBE_ANY(~0)drivers/serial/8250.h +0
-0@@ -78,3 +79,22 @@ struct serial8250_config {#else
drivers/serial/8250.h struct serial8250_config { · line 89
Quoted 10 lines
drivers/serial/8250.h +8
-0#define ALPHA_KLUDGE_MCR 0#endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to =
enable */
drivers/serial/8250.h struct serial8250_config {
Quoted 9 lines
drivers/serial/8250.h +9
-0+#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR =
| \
drivers/serial/Kconfig
Quoted 12 lines
drivers/serial/8250.h +2
-0+ HAS_BUG_THRE | HAS_BUG_PPC) +drivers/serial/Kconfig +0
-0@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLE=20
If unsure, say N.
=20drivers/serial/Kconfig +2
-0+config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a =
break"
drivers/serial/Kconfig config SERIAL_8250_CONSOLE
Quoted 3 lines
drivers/serial/Kconfig +3
-0+ depends on SERIAL_8250 && PPC32 + ---help--- + If you say Y here, addional checks will be added in the =
handling of
drivers/serial/Kconfig
Quoted 1 line
drivers/serial/Kconfig +1
-0+ interrupts on the serial ports which will prevent ill effects =
of
drivers/serial/Kconfig
Quoted 1 line
drivers/serial/Kconfig +1
-0+ an interrupt storm triggered by a break on the serial line. =
Without
drivers/serial/Kconfig
Quoted 1 line
drivers/serial/Kconfig +1
-0+ this enabled, a Sysrq via the serial console can be unusable =
on
drivers/serial/Kconfig config SERIAL_8250_CONSOLE
Quoted 3 lines
drivers/serial/Kconfig +3
-0+ some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based =
boards.
drivers/serial/Kconfig config SERIAL_8250_CONSOLE · line 86
Quoted 3 lines
drivers/serial/Kconfig +3
-0+ + If unsure, say N. +
is there harm caused if we have SERIAL_8250_PPC_BUG set and dont need = it?
- k=
Quoted 3 lines · Kumar Gala
On Feb 26, 2010, at 1:25 PM, Paul Gortmaker wrote:
[...]
Quoted 6 lines
Quoted 6 lines
drivers/serial/8250.c +5
-0+if ((up->bugs&UART_BUG_PPC )&& (status ==UART_LSR_RFE_ERROR_BITS )) { +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + } +
[...]
Quoted 2 lines
is there harm caused if we have
SERIAL_8250_PPC_BUGset and dont need it?
In theory, no -- strip away all the window dressing and we are left with the above change. So, you'd have to have some UART implementation that was setting those bits and still relying on its interrupt event to be processed normally. But since there are so many different 8250 implementations out there, I was being cautious and taking the absolute safe approach.
P.
Quoted 2 lines
- k
Quoted 31 lines · Kumar Gala
Quoted 28 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker <[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)drivers/serial/8250.c +0
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up)
Quoted 6 lines
drivers/serial/8250.c static void serial8250_handle_port(struct uart_8250_port *up) · line 1537
Quoted 6 lines
drivers/serial/8250.c +4
-0status =serial_inp (up,UART_LSR ); +if ((up->bugs &UART_BUG_PPC ) && (status ==UART_LSR_RFE_ERROR_BITS )) { +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + }
Will LSR always be 0xf1 when this problem hits? At least the transmit bits shouldn't be relevant.
This has been listed as an erratum in some of the newer chips (e.g. mpc8568).
The suggested as workaround is to, upon seeing a break condition:
- read RBR
- delay at least one character period
- read RBR again
If I'm interpreting this correctly, it could be implemented by doing the normal break handling on the first interrupt, plus setting a flag so that the next interrupt simply reads RBR, clears the flag, and returns, without ever reading LSR.
-Scott
Quoted 34 lines · [Re: [PATCH] 8250: add workaround for MPC8[356]xx UART break IRQ storm] On…
Quoted 33 lines · Kumar Gala
Quoted 30 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker <[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)drivers/serial/8250.c +0
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up) status =serial_inp (up,UART_LSR );
Quoted 7 lines
Quoted 4 lines
drivers/serial/8250.c static void serial8250_handle_port(struct uart_8250_port *up) · line 1537
Quoted 4 lines
drivers/serial/8250.c +4
-0+if ((up->bugs &UART_BUG_PPC ) && (status ==UART_LSR_RFE_ERROR_BITS )) { +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + }Will LSR always be
0xf1when this problem hits? At least the transmit bits shouldn't be relevant.
It was, based only on the emperical data I collected. I agree that the Tx data shouldn't really matter. But it is a moot point now that I know about the errata workaround...
Quoted 9 lines
This has been listed as an erratum in some of the newer chips (e.g. mpc8568).
The suggested as workaround is to, upon seeing a break condition:
- read RBR
- delay at least one character period
- read RBR again
Quoted 4 lines
If I'm interpreting this correctly, it could be implemented by doing the normal break handling on the first interrupt, plus setting a flag so that the next interrupt simply reads RBR, clears the flag, and returns, without ever reading LSR.
Thanks for the info -- that makes for a better fix (in that the storm gets averted completely) so your interpretation is on the money.
The only question that remains is whether we:
(a) deploy it everywhere, or
(b) leave it as a config option and update Kconfig with select on the boards of interest, or
(c) implement dynamic enablement based on something like adding a detect_arch_bugs() to 8250.c and then for powerpc, we iterate over of_flat_dt_is_compatible(root, blacklist[i]) looking for a match.
Paul.
From c77b1600975b5fc596b2baebf43e28b66969181f Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Fri, 26 Feb 2010 10:29:46 -0500
Subject: [PATCH] 8250: add workaround for MPC8[356]xx UART break IRQ storm
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (/proc/interrupts typically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable.
The suggested workaround in the errata is to read the Rx register, wait one character period, and then read the Rx register again. We achieve this by tracking the old LSR value, and on the subsequent interrupt event after a break, we don't read LSR, instead we just read the RBR again and return immediately.
--- drivers/serial/8250.c | 11 ++++++++++- drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ 3 files changed, 44 insertions(+), 1 deletions(-)
drivers/serial/8250.c +10 -1
@@ -143,6 +143,7 @@ struct uart_8250_port {unsigned char mcr_mask;/* mask of user bits */ unsigned char mcr_force;/* mask of forced bits */ unsigned char cur_iotype;/* Running I/O type */ +unsigned char lsr_last;/* LSR of last IRQ event */ /* * Some bits in registers are cleared on a read, so they must
@@ -1529,7 +1530,14 @@ static void serial8250_handle_port(struct uart_8250_port *up)spin_lock_irqsave (&up->port.lock, flags); - status =serial_inp (up,UART_LSR ); +if (unlikely (up->lsr_last &UART_LSR_BI && up->bugs &UART_BUG_PPC )) { + up->lsr_last &= ~UART_LSR_BI ; +serial_inp (up,UART_RX ); +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + } + + status = up->lsr_last =serial_inp (up,UART_LSR );DEBUG_INTR ("status = %x..." , status);
@@ -1948,6 +1956,7 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr =0 ; + up->bugs |=UART_KNOWN_BUGS ;if (up->port.iotype != up->cur_iotype)set_io_from_upio (port);
drivers/serial/8250.h +20 -0
@@ -49,6 +49,7 @@ struct serial8250_config {#define UART_BUG_TXEN (1 << 1)/* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1 << 3)/* UART has buggy THRE reassertion */ +#define UART_BUG_PPC (1 << 4)/* UART has buggy PPC break IRQ storm */ #define PROBE_RSA (1 << 0)#define PROBE_ANY (~0)
@@ -78,3 +79,22 @@ struct serial8250_config {#else #define ALPHA_KLUDGE_MCR 0#endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to enable */ +#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR | \ + HAS_BUG_THRE | HAS_BUG_PPC) +
drivers/serial/Kconfig +14 -0
@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLE If unsure, say N. +config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a break" + depends on SERIAL_8250 && PPC32 + ---help--- + If you say Y here, additional checks will be added to handling of + interrupts on the serial ports which will prevent ill effects of + an interrupt storm triggered by a break on the serial line. Without + this enabled, a Sysrq via the serial console can be unusable on + some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based boards. + + If unsure, say N. + config FIX_EARLYCON_MEM bool depends on X86
Signature · 1 line
1.6.5.2
sounds very much like this issue:
http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-02/msg09470.html
(interrupt storm on the second port which is hit with breaks).
It's not the uart driver problem per se, the below fixes it:
*** linux/drivers/serial/serial_core.c#1 Wed Feb 24 17:46:22 2010
--- linux/drivers/serial/serial_core.c#2 Mon Mar 1 15:00:29 2010
***************
*** 622,632 ****
struct uart_port *port = state->port;
if (I_IXOFF(tty)) {
if (port->x_char)
port->x_char = 0;
! else
uart_send_xchar(tty, START_CHAR(tty));
}
if (tty->termios->c_cflag & CRTSCTS)
uart_set_mctrl(port, TIOCM_RTS);
--- 622,632 ----
struct uart_port *port = state->port;
if (I_IXOFF(tty)) {
if (port->x_char)
port->x_char = 0;
! else if (!(tty->flags & (1 << TTY_IO_ERROR)))
uart_send_xchar(tty, START_CHAR(tty));
}
if (tty->termios->c_cflag & CRTSCTS)
uart_set_mctrl(port, TIOCM_RTS);^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
I did not get to trying to submit it, but it sure gets rid o the storm.
cheers,
/vb
Quoted 129 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker <[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c | 6 ++++++
drivers/serial/8250.h| 20 ++++++++++++++++++++drivers/serial/Kconfig| 14 ++++++++++++++include/linux/serial_reg.h| 2 ++4 files changed, 42 insertions(+), 0 deletions(-)drivers/serial/8250.c +6
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up) status = serial_inp(up, UART_LSR); + if ((up->bugs & UART_BUG_PPC) && (status == UART_LSR_RFE_ERROR_BITS)) { + spin_unlock_irqrestore(&up->port.lock, flags); + return; + } + DEBUG_INTR("status = %x...", status); if (status & (UART_LSR_DR | UART_LSR_BI))@@ -1948,6 +1953,7 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr = 0; + up->bugs |= UART_KNOWN_BUGS; if (up->port.iotype != up->cur_iotype) set_io_from_upio(port);drivers/serial/8250.h +20
-0@@ -49,6 +49,7 @@ struct serial8250_config { #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1 << 3) /* UART has buggy THRE reassertion */ +#define UART_BUG_PPC (1 << 4)/* UART has buggy PPC break IRQ storm */ #define PROBE_RSA (1 << 0) #define PROBE_ANY (~0)@@ -78,3 +79,22 @@ struct serial8250_config { #else #define ALPHA_KLUDGE_MCR 0 #endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to enable */ +#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR | \ + HAS_BUG_THRE | HAS_BUG_PPC) +drivers/serial/Kconfig +0
-0@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLEIf unsure, say N.
drivers/serial/Kconfig +14
-0+config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a break" + depends on SERIAL_8250 && PPC32 + ---help--- + If you say Y here, addional checks will be added in the handling of + interrupts on the serial ports which will prevent ill effects of + an interrupt storm triggered by a break on the serial line. Without + this enabled, a Sysrq via the serial console can be unusable on + some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based boards. + + If unsure, say N. +config
FIX_EARLYCON_MEM
bool
depends on X86include/linux/serial_reg.h +2
-1@@ -111,6 +111,7 @@ #define UART_MCR_DTR 0x01 /* DTR complement */ #define UART_LSR 5 /* In: Line Status Register */ +#define UART_LSR_RFE 0x80/* Rx FIFO Error (BE, FE, or PE) */ #define UART_LSR_TEMT 0x40 /* Transmitter empty */ #define UART_LSR_THRE 0x20 /* Transmit-hold-register empty */ #define UART_LSR_BI 0x10 /* Break interrupt indicator */@@ -119,6 +120,7 @@ #define UART_LSR_OE 0x02 /* Overrun error indicator */ #define UART_LSR_DR 0x01 /* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E /* BI, FE, PE, OE bits */ +#define UART_LSR_RFE_ERROR_BITS 0xF1/* RFE, TEMT, THRE, BI, DR bits */ #define UART_MSR 6 /* In: Modem Status Register */ #define UART_MSR_DCD 0x80 /* Data Carrier Detect */ --1.6.5.2
Quoted 5 lines
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines · On 10-03-01 06:03 PM, [email protected] wrote:
sounds very much like this issue:
http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-02/msg09470.html
Thanks for the link.
Quoted 4 lines
(interrupt storm on the second port which is hit with breaks).
It's not the uart driver problem per se, the below fixes it:
Actually, it is a uart *hardware* problem -- see in this same thread where Scott Wood described an errata, and when I implemented his interpretation of what the fix should look like, things just worked. You might want to try out that patch and see if it helps you, since from the link above, I see you are also on a powerpc board.
Paul.
Quoted 171 lines
*** linux/drivers/serial/serial_core.c#1 Wed Feb 24 17:46:22 2010
--- linux/drivers/serial/serial_core.c#2 Mon Mar 1 15:00:29 2010
***************
*** 622,632 ****struct uart_port *port = state->port; if (I_IXOFF(tty)) { if (port->x_char) port->x_char = 0; ! else uart_send_xchar(tty, START_CHAR(tty)); } if (tty->termios->c_cflag& CRTSCTS) uart_set_mctrl(port, TIOCM_RTS); --- 622,632 ---- struct uart_port *port = state->port; if (I_IXOFF(tty)) { if (port->x_char) port->x_char = 0; ! else if (!(tty->flags& (1<< TTY_IO_ERROR))) uart_send_xchar(tty, START_CHAR(tty)); } if (tty->termios->c_cflag& CRTSCTS) uart_set_mctrl(port, TIOCM_RTS);^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
I did not get to trying to submit it, but it sure gets rid o the storm.
cheers,
/vbQuoted 134 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker<[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)drivers/serial/8250.c +6
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up) status =serial_inp (up,UART_LSR ); +if ((up->bugs&UART_BUG_PPC )&& (status ==UART_LSR_RFE_ERROR_BITS )) { +spin_unlock_irqrestore (&up->port.lock, flags); +return ; + } +DEBUG_INTR ("status = %x..." , status);if (status& (UART_LSR_DR |UART_LSR_BI ))@@ -1948,6 +1953,7 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr =0 ; + up->bugs |=UART_KNOWN_BUGS ;if (up->port.iotype != up->cur_iotype)set_io_from_upio (port);drivers/serial/8250.h +20
-0@@ -49,6 +49,7 @@ struct serial8250_config {#define UART_BUG_TXEN (1<< 1)/* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1<< 2)/* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1<< 3)/* UART has buggy THRE reassertion */ +#define UART_BUG_PPC (1<< 4)/* UART has buggy PPC break IRQ storm */ #define PROBE_RSA (1<< 0)#define PROBE_ANY (~0)@@ -78,3 +79,22 @@ struct serial8250_config {#else #define ALPHA_KLUDGE_MCR 0#endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to enable */ +#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR | \ + HAS_BUG_THRE | HAS_BUG_PPC) +drivers/serial/Kconfig +14
-0@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLE If unsure, say N. +config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a break" + depends on SERIAL_8250&& PPC32 + ---help--- + If you say Y here, addional checks will be added in the handling of + interrupts on the serial ports which will prevent ill effects of + an interrupt storm triggered by a break on the serial line. Without + this enabled, a Sysrq via the serial console can be unusable on + some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based boards. + + If unsure, say N. + config FIX_EARLYCON_MEM bool depends on X86include/linux/serial_reg.h +2
-1@@ -111,6 +111,7 @@#define UART_MCR_DTR 0x01/* DTR complement */ #define UART_LSR 5/* In: Line Status Register */ +#define UART_LSR_RFE 0x80/* Rx FIFO Error (BE, FE, or PE) */ #define UART_LSR_TEMT 0x40/* Transmitter empty */ #define UART_LSR_THRE 0x20/* Transmit-hold-register empty */ #define UART_LSR_BI 0x10/* Break interrupt indicator */ @@ -119,6 +120,7 @@#define UART_LSR_OE 0x02/* Overrun error indicator */ #define UART_LSR_DR 0x01/* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E/* BI, FE, PE, OE bits */ +#define UART_LSR_RFE_ERROR_BITS 0xF1/* RFE, TEMT, THRE, BI, DR bits */ #define UART_MSR 6/* In: Modem Status Register */ #define UART_MSR_DCD 0x80/* Data Carrier Detect */ --1.6.5.2
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 12 lines · Paul Gortmaker
Quoted 3 lines · On 10-03-01 06:03 PM, [email protected] wrote:
sounds very much like this issue:
http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-02/msg09470.html
Thanks for the link.
Quoted 4 lines
(interrupt storm on the second port which is hit with breaks).
It's not the uart driver problem per se, the below fixes it:
Quoted 9 lines
Actually, it is a uart *hardware* problem -- see in this same thread where Scott Wood described an errata, and when I implemented his interpretation of what the fix should look like, things just worked. You might want to try out that patch and see if it helps you, since from the link above, I see you are also on a powerpc board.
Paul.
yeah, I was not aware of the hardware bug you are describing, it's just the scenario I encountered is very similar: the serial interface is flooded with breaks, after a while the prot generates an IRQ storm. But the storm happens only after the port gets shut down (by getty in my case).
In my case this behavior is due to a SW bug, you might be hitting the HW problem, I have not seen it yet,
cheers,
/vb
Quoted 166 lines
Quoted 166 lines
*** linux/drivers/serial/serial_core.c#1 Wed Feb 24 17:46:22 2010 --- linux/drivers/serial/serial_core.c#2 Mon Mar 1 15:00:29 2010
***************
*** 622,632 ****
structuart_port*port =state->port;if (
I_IXOFF(tty)) {
if (port->x_char)
port->x_char = 0;
! else
uart_send_xchar(tty,START_CHAR(tty)); }if (tty->termios->c_cflag& CRTSCTS)
uart_set_mctrl(port,TIOCM_RTS);
--- 622,632 ----
structuart_port*port =state->port;if (
I_IXOFF(tty)) {
if (port->x_char)
port->x_char = 0;
! else if (!(tty->flags& (1<< TTY_IO_ERROR)))uart_send_xchar(tty, START_CHAR(tty)); }if (tty->termios->c_cflag& CRTSCTS)
uart_set_mctrl(port,TIOCM_RTS); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^I did not get to trying to submit it, but it sure gets rid o the storm.
cheers,
/vbQuoted 129 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker<[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
drivers/serial/8250.c| 6 ++++++drivers/serial/8250.h| 20 ++++++++++++++++++++drivers/serial/Kconfig| 14 ++++++++++++++include/linux/serial_reg.h| 2 ++4 files changed, 42 insertions(+), 0 deletions(-)drivers/serial/8250.c +6
-0@@ -1531,6 +1531,11 @@ static void serial8250_handle_port(struct uart_8250_port *up) status = serial_inp(up, UART_LSR); + if ((up->bugs& UART_BUG_PPC)&& (status == UART_LSR_RFE_ERROR_BITS)) { + spin_unlock_irqrestore(&up->port.lock, flags); + return; + } + DEBUG_INTR("status = %x...", status); if (status& (UART_LSR_DR | UART_LSR_BI))@@ -1948,6 +1953,7 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr = 0; + up->bugs |= UART_KNOWN_BUGS; if (up->port.iotype != up->cur_iotype) set_io_from_upio(port);drivers/serial/8250.h +20
-0@@ -49,6 +49,7 @@ struct serial8250_config { #define UART_BUG_TXEN (1<< 1) /* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1<< 2) /* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1<< 3) /* UART has buggy THRE reassertion */ +#define UART_BUG_PPC (1<< 4)/* UART has buggy PPC break IRQ storm */ #define PROBE_RSA (1<< 0) #define PROBE_ANY (~0)@@ -78,3 +79,22 @@ struct serial8250_config { #else #define ALPHA_KLUDGE_MCR 0 #endif + +/* +* The following UART bugs are currently dynamically detected and not +* required to be contingent on any particular compile time options. +*/ +#define HAS_BUG_QUOT 0/* assign UART_BUG_QUOT to enable */ +#define HAS_BUG_TXEN 0/* assign UART_BUG_TXEN to enable */ +#define HAS_BUG_NOMSR 0/* assign UART_BUG_NOMSR to enable */ +#define HAS_BUG_THRE 0/* assign UART_BUG_THRE to enable */ + +#ifdef CONFIG_SERIAL_8250_PPC_BUG +#define HAS_BUG_PPC UART_BUG_PPC +#else +#define HAS_BUG_PPC 0 +#endif + +#define UART_KNOWN_BUGS (HAS_BUG_QUOT | HAS_BUG_TXEN | HAS_BUG_NOMSR | \ + HAS_BUG_THRE | HAS_BUG_PPC) +drivers/serial/Kconfig +0
-0@@ -70,6 +70,20 @@ config SERIAL_8250_CONSOLEIf unsure, say N.
drivers/serial/Kconfig +14
-0+config SERIAL_8250_PPC_BUG + bool "Fix 8250/16550 to handle IRQ storm after receipt of a break" + depends on SERIAL_8250&& PPC32 + ---help--- + If you say Y here, addional checks will be added in the handling of + interrupts on the serial ports which will prevent ill effects of + an interrupt storm triggered by a break on the serial line. Without + this enabled, a Sysrq via the serial console can be unusable on + some systems. + + This is commonly observed on PPC32 MPC83xx/85xx/86xx based boards. + + If unsure, say N. +config
FIX_EARLYCON_MEM
bool
depends on X86include/linux/serial_reg.h +2
-1@@ -111,6 +111,7 @@ #define UART_MCR_DTR 0x01 /* DTR complement */ #define UART_LSR 5 /* In: Line Status Register */ +#define UART_LSR_RFE 0x80/* Rx FIFO Error (BE, FE, or PE) */ #define UART_LSR_TEMT 0x40 /* Transmitter empty */ #define UART_LSR_THRE 0x20 /* Transmit-hold-register empty */ #define UART_LSR_BI 0x10 /* Break interrupt indicator */@@ -119,6 +120,7 @@ #define UART_LSR_OE 0x02 /* Overrun error indicator */ #define UART_LSR_DR 0x01 /* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E /* BI, FE, PE, OE bits */ +#define UART_LSR_RFE_ERROR_BITS 0xF1/* RFE, TEMT, THRE, BI, DR bits */ #define UART_MSR 6 /* In: Modem Status Register */ #define UART_MSR_DCD 0x80 /* Data Carrier Detect */ --1.6.5.2
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 16 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here. =20Signed-off-by Paul Gortmaker <[email protected]>---
=20
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
=20
Quoted 5 lines
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)
Did we ever decide what to do with this or trying to get it accepted = upstream?
- k=
Quoted 19 lines · Kumar Gala
Quoted 16 lines · Paul Gortmaker
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). Unfortunately this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here.Signed-off-by Paul Gortmaker <[email protected]>---
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
Quoted 7 lines
Quoted 5 lines
drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)Did we ever decide what to do with this or trying to get it accepted upstream?
That is an old version. ScottW gave me the errata information which allowed me to fix the problem in a cleaner way.
http://patchwork.ozlabs.org/patch/46609/
I think the above version is OK as-is; the only thing I think we could do to improve it is to go and automatically select the thing based on known impacted CPU types (which could be a separate commit or commits, as various CPUs are confirmed to have the issue.)
Paul.
Quoted 2 lines
- k
Quoted 7 lines · Paul Gortmaker
Quoted 6 lines · Kumar Gala
=20
On Feb 26, 2010, at 1:25 PM, Paul Gortmaker wrote:
=20Quoted 3 lines
Sending a break on the SOC UARTs found in some MPC83xx/85xx/86xx chips seems to cause a short lived IRQ storm (
/proc/interruptstypically shows somewhere between 300 and 1500 events). =
Unfortunately
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
this renders SysRQ over the serial console completely inoperable. Testing with obvious things like ACKing the event doesn't seem to change anything vs. a completely dumb approach of just ignoring it and waiting for it to stop, so that is what is implemented here. =20
Signed-off-by Paul Gortmaker <[email protected]>---
=20
This is a refresh of a patch I'd done earlier -- I've tried to make the bug support as generic as possible to minimize having board specific ifdef crap in 8250.c -- any suggestions on how to further improve it are welcome.
=20drivers/serial/8250.c | 6 ++++++ drivers/serial/8250.h | 20 ++++++++++++++++++++ drivers/serial/Kconfig | 14 ++++++++++++++ include/linux/serial_reg.h | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-)
Quoted 2 lines
Quoted 2 lines
=20
Did we ever decide what to do with this or trying to get it accepted =
upstream?
Quoted 11 lines
=20
That is an old version. ScottW gave me the errata information which allowed me to fix the problem in a cleaner way. =20
http://patchwork.ozlabs.org/patch/46609/
=20
I think the above version is OK as-is; the only thing I think we could do to improve it is to go and automatically select the thing based on known impacted CPU types (which could be a separate commit or commits, as various CPUs are confirmed to have the issue.)
Seems as if we could have ->bugs passed in via plat_serial8250_port and = than we can get the info from the device tree.
- k=