serial: Fix IGNBRK handling
Subsystems (14)
PATCH 1/2 serial: Fix IGNBRK handling
If IGNBRK is set without either BRKINT or PARMRK set, some uart drivers send a 0x00 byte for BREAK without the TTYBREAK flag to the line discipline, when it should send either nothing or the TTYBREAK flag set. This happens because the read_status_mask masks out the BI condition, which uart_insert_char() then interprets as a normal 0x00 byte.
SUS v3 is clear regarding the meaning of IGNBRK; Section 11.2.2, General Terminal Interface - Input Modes, states:
"If IGNBRK is set, a break condition detected on input shall be ignored;
that is, not put on the input queue and therefore not read by any process."
Fix read_status_mask to include the BI bit if IGNBRK is set; the lsr status retains the BI bit if a BREAK is recv'd, which is subsequently ignored in uart_insert_char() when masked with the ignore_status_mask.
Affected drivers:
8250 - allserial_txx9
mfd
amba-pl010
amba-pl011atmel_serialbfin_uart
dz
ip22zilog
max310x
mxs-auart
netx-serialpnx8xxx_uart
pxa
sb1250-duart
sccnxpserial_ks8695sirfsoc_uart
st-ascvr41xx_siu
zs
sunzilogfsl_lpuart
sunsabucc_uartbcm63xx_uart
sunsu
efm32-uartpmac_zilog
mpscmsm_serialm32r_sio
Unaffected drivers:
omap-serial
rp2
sa1100
imx
icom
Annotated for fixes:altera_uart
mcf
Drivers without break detection:
21285
xilinx-uartpsaltera_jtaguart
apbuart
arc-uart
clps711x
max3100
uartlitemsm_serial_hs
nwpserial
lantiqvt8500_serial
Unknown:
samsungmpc52xx_uartbfin_sport_uart
cpm_uart/core
--- drivers/tty/serial/8250/8250_core.c | 2 +- drivers/tty/serial/altera_uart.c | 6 ++++++ drivers/tty/serial/amba-pl010.c | 2 +- drivers/tty/serial/amba-pl011.c | 2 +- drivers/tty/serial/atmel_serial.c | 2 +- drivers/tty/serial/bcm63xx_uart.c | 2 +- drivers/tty/serial/bfin_uart.c | 2 +- drivers/tty/serial/dz.c | 2 +- drivers/tty/serial/efm32-uart.c | 2 +- drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/tty/serial/ip22zilog.c | 2 +- drivers/tty/serial/m32r_sio.c | 2 +- drivers/tty/serial/max310x.c | 2 +- drivers/tty/serial/mcf.c | 6 ++++++ drivers/tty/serial/mfd.c | 2 +- drivers/tty/serial/mpsc.c | 2 +- drivers/tty/serial/msm_serial.c | 2 +- drivers/tty/serial/mxs-auart.c | 2 +- drivers/tty/serial/netx-serial.c | 2 +- drivers/tty/serial/pmac_zilog.c | 2 +- drivers/tty/serial/pnx8xxx_uart.c | 2 +- drivers/tty/serial/pxa.c | 2 +- drivers/tty/serial/sb1250-duart.c | 2 +- drivers/tty/serial/sccnxp.c | 2 +- drivers/tty/serial/serial_ks8695.c | 2 +- drivers/tty/serial/serial_txx9.c | 2 +- drivers/tty/serial/sirfsoc_uart.c | 2 +- drivers/tty/serial/st-asc.c | 2 +- drivers/tty/serial/sunsab.c | 2 +- drivers/tty/serial/sunsu.c | 2 +- drivers/tty/serial/sunzilog.c | 2 +- drivers/tty/serial/ucc_uart.c | 2 +- drivers/tty/serial/vr41xx_siu.c | 2 +- drivers/tty/serial/zs.c | 2 +- 34 files changed, 44 insertions(+), 32 deletions(-)
drivers/tty/serial/8250/8250_core.c +1 -1
@@ -2360,7 +2360,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, port->read_status_mask =UART_LSR_OE |UART_LSR_THRE |UART_LSR_DR ;if (termios->c_iflag &INPCK ) port->read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=UART_LSR_BI ;/*
drivers/tty/serial/altera_uart.c +6 -0
@@ -185,6 +185,12 @@ static void altera_uart_set_termios(struct uart_port *port,uart_update_timeout (port, termios->c_cflag, baud);altera_uart_writel (port, baudclk,ALTERA_UART_DIVISOR_REG );spin_unlock_irqrestore (&port->lock, flags); + +/* +* FIXME: port->read_status_mask and port->ignore_status_mask +* need to be initialized based on termios settings for +* INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT +*/ }static void altera_uart_rx_chars (struct altera_uart *pp)
drivers/tty/serial/amba-pl010.c +1 -1
@@ -420,7 +420,7 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios, uap->port.read_status_mask = UART01x_RSR_OE;if (termios->c_iflag &INPCK ) uap->port.read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) uap->port.read_status_mask |= UART01x_RSR_BE;/*
drivers/tty/serial/amba-pl011.c +1 -1
@@ -1744,7 +1744,7 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios, port->read_status_mask =UART011_DR_OE |255 ;if (termios->c_iflag &INPCK ) port->read_status_mask |=UART011_DR_FE |UART011_DR_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=UART011_DR_BE ;/*
drivers/tty/serial/atmel_serial.c +1 -1
@@ -1784,7 +1784,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, port->read_status_mask =ATMEL_US_OVRE ;if (termios->c_iflag &INPCK ) port->read_status_mask |= (ATMEL_US_FRAME |ATMEL_US_PARE ); -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=ATMEL_US_RXBRK ;if (atmel_use_pdc_rx (port))
drivers/tty/serial/bcm63xx_uart.c +1 -1
@@ -567,7 +567,7 @@ static void bcm_uart_set_termios(struct uart_port *port, port->read_status_mask |=UART_FIFO_FRAMEERR_MASK ; port->read_status_mask |=UART_FIFO_PARERR_MASK ; } -if (new->c_iflag & (BRKINT )) +if (new->c_iflag & (IGNBRK |BRKINT )) port->read_status_mask |=UART_FIFO_BRKDET_MASK ; port->ignore_status_mask =0 ;
drivers/tty/serial/bfin_uart.c +1 -1
@@ -833,7 +833,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, port->read_status_mask =OE ;if (termios->c_iflag &INPCK ) port->read_status_mask |= (FE |PE ); -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=BI ;/*
drivers/tty/serial/dz.c +1 -1
@@ -625,7 +625,7 @@ static void dz_set_termios(struct uart_port *uport, struct ktermios *termios, dport->port.read_status_mask =DZ_OERR ;if (termios->c_iflag &INPCK ) dport->port.read_status_mask |=DZ_FERR |DZ_PERR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) dport->port.read_status_mask |=DZ_BREAK ;/* characters to ignore */
drivers/tty/serial/efm32-uart.c +1 -1
@@ -407,7 +407,7 @@ static void efm32_uart_set_termios(struct uart_port *port,if (new->c_iflag &INPCK ) port->read_status_mask |= UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR; -if (new->c_iflag & (BRKINT |PARMRK )) +if (new->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |= SW_UARTn_RXDATAX_BERR; port->ignore_status_mask =0 ;
drivers/tty/serial/fsl_lpuart.c +1 -1
@@ -902,7 +902,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, sport->port.read_status_mask =0 ;if (termios->c_iflag &INPCK ) sport->port.read_status_mask |= (UARTSR1_FE |UARTSR1_PE ); -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) sport->port.read_status_mask |=UARTSR1_FE ;/* characters to ignore */
drivers/tty/serial/ip22zilog.c +1 -1
@@ -850,7 +850,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag, up->port.read_status_mask = Rx_OVR;if (iflag &INPCK ) up->port.read_status_mask |=CRC_ERR |PAR_ERR ; -if (iflag & (BRKINT |PARMRK )) +if (iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=BRK_ABRT ; up->port.ignore_status_mask =0 ;
drivers/tty/serial/m32r_sio.c +1 -1
@@ -737,7 +737,7 @@ static void m32r_sio_set_termios(struct uart_port *port, up->port.read_status_mask =UART_LSR_OE |UART_LSR_THRE |UART_LSR_DR ;if (termios->c_iflag &INPCK ) up->port.read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=UART_LSR_BI ;/*
drivers/tty/serial/max310x.c +1 -1
@@ -835,7 +835,7 @@ static void max310x_set_termios(struct uart_port *port,if (termios->c_iflag &INPCK ) port->read_status_mask |=MAX310X_LSR_RXPAR_BIT |MAX310X_LSR_FRERR_BIT ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=MAX310X_LSR_RXBRK_BIT ;/* Set status ignore mask */
drivers/tty/serial/mcf.c +6 -0
@@ -248,6 +248,12 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios, mr1 |=MCFUART_MR1_PARITYNONE ; } +/* +* FIXME: port->read_status_mask and port->ignore_status_mask +* need to be initialized based on termios settings for +* INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT +*/ +if (termios->c_cflag &CSTOPB ) mr2 |=MCFUART_MR2_STOP2 ;else
drivers/tty/serial/mfd.c +1 -1
@@ -977,7 +977,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, up->port.read_status_mask =UART_LSR_OE |UART_LSR_THRE |UART_LSR_DR ;if (termios->c_iflag &INPCK ) up->port.read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=UART_LSR_BI ;/* Characters to ignore */
drivers/tty/serial/mpsc.c +1 -1
@@ -1458,7 +1458,7 @@ static void mpsc_set_termios(struct uart_port *port, struct ktermios *termios, pi->port.read_status_mask |=SDMA_DESC_CMDSTAT_PE |SDMA_DESC_CMDSTAT_FR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) pi->port.read_status_mask |=SDMA_DESC_CMDSTAT_BR ;/* Characters/events to ignore */
drivers/tty/serial/msm_serial.c +1 -1
@@ -583,7 +583,7 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios, port->read_status_mask =0 ;if (termios->c_iflag &INPCK ) port->read_status_mask |=UART_SR_PAR_FRAME_ERR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=UART_SR_RX_BREAK ;uart_update_timeout (port, termios->c_cflag, baud);
drivers/tty/serial/mxs-auart.c +1 -1
@@ -604,7 +604,7 @@ static void mxs_auart_settermios(struct uart_port *u,if (termios->c_iflag &INPCK ) u->read_status_mask |=AUART_STAT_PERR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) u->read_status_mask |=AUART_STAT_BERR ;/*
drivers/tty/serial/netx-serial.c +1 -1
@@ -419,7 +419,7 @@ netx_set_termios(struct uart_port *port, struct ktermios *termios, } port->read_status_mask =0 ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=SR_BE ;if (termios->c_iflag &INPCK ) port->read_status_mask |=SR_PE |SR_FE ;
drivers/tty/serial/pmac_zilog.c +1 -1
@@ -1092,7 +1092,7 @@ static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag, uap->port.read_status_mask = Rx_OVR;if (iflag &INPCK ) uap->port.read_status_mask |=CRC_ERR |PAR_ERR ; -if (iflag & (BRKINT |PARMRK )) +if (iflag & (IGNBRK |BRKINT |PARMRK )) uap->port.read_status_mask |=BRK_ABRT ; uap->port.ignore_status_mask =0 ;
drivers/tty/serial/pnx8xxx_uart.c +1 -1
@@ -477,7 +477,7 @@ pnx8xxx_set_termios(struct uart_port *port, struct ktermios *termios, sport->port.read_status_mask |=FIFO_TO_SM (PNX8XXX_UART_FIFO_RXFE ) |FIFO_TO_SM (PNX8XXX_UART_FIFO_RXPAR ); -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) sport->port.read_status_mask |=ISTAT_TO_SM (PNX8XXX_UART_INT_BREAK );
drivers/tty/serial/pxa.c +1 -1
@@ -492,7 +492,7 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, up->port.read_status_mask =UART_LSR_OE |UART_LSR_THRE |UART_LSR_DR ;if (termios->c_iflag &INPCK ) up->port.read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=UART_LSR_BI ;/*
drivers/tty/serial/sb1250-duart.c +1 -1
@@ -596,7 +596,7 @@ static void sbd_set_termios(struct uart_port *uport, struct ktermios *termios,if (termios->c_iflag &INPCK ) uport->read_status_mask |=M_DUART_FRM_ERR |M_DUART_PARITY_ERR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) uport->read_status_mask |=M_DUART_RCVD_BRK ; uport->ignore_status_mask =0 ;
drivers/tty/serial/sccnxp.c +1 -1
@@ -667,7 +667,7 @@ static void sccnxp_set_termios(struct uart_port *port, port->read_status_mask =SR_OVR ;if (termios->c_iflag &INPCK ) port->read_status_mask |=SR_PE |SR_FE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=SR_BRK ;/* Set status ignore mask */
drivers/tty/serial/serial_ks8695.c +1 -1
@@ -437,7 +437,7 @@ static void ks8695uart_set_termios(struct uart_port *port, struct ktermios *term port->read_status_mask =URLS_URROE ;if (termios->c_iflag &INPCK ) port->read_status_mask |= (URLS_URFE |URLS_URPE ); -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=URLS_URBI ;/*
drivers/tty/serial/serial_txx9.c +1 -1
@@ -702,7 +702,7 @@ serial_txx9_set_termios(struct uart_port *port, struct ktermios *termios,TXX9_SIDISR_TDIS |TXX9_SIDISR_RDIS ;if (termios->c_iflag &INPCK ) up->port.read_status_mask |=TXX9_SIDISR_UFER |TXX9_SIDISR_UPER ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=TXX9_SIDISR_UBRK ;/*
drivers/tty/serial/sirfsoc_uart.c +1 -1
@@ -907,7 +907,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,if (termios->c_iflag &INPCK ) port->read_status_mask |= uint_en->sirfsoc_frm_err_en; } -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |= uint_en->sirfsoc_rxd_brk_en;if (sirfport->uart_reg->uart_type ==SIRF_REAL_UART ) {if (termios->c_iflag &IGNPAR )
drivers/tty/serial/st-asc.c +1 -1
@@ -547,7 +547,7 @@ static void asc_set_termios(struct uart_port *port, struct ktermios *termios, ascport->port.read_status_mask =ASC_RXBUF_DUMMY_OE ;if (termios->c_iflag &INPCK ) ascport->port.read_status_mask |=ASC_RXBUF_FE |ASC_RXBUF_PE ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) ascport->port.read_status_mask |=ASC_RXBUF_DUMMY_BE ;/*
drivers/tty/serial/sunsab.c +1 -1
@@ -719,7 +719,7 @@ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cflaif (iflag &INPCK ) up->port.read_status_mask |= (SAB82532_ISR0_PERR |SAB82532_ISR0_FERR ); -if (iflag & (BRKINT |PARMRK )) +if (iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |= (SAB82532_ISR1_BRK <<8 );/*
drivers/tty/serial/sunsu.c +1 -1
@@ -834,7 +834,7 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag, up->port.read_status_mask =UART_LSR_OE |UART_LSR_THRE |UART_LSR_DR ;if (iflag &INPCK ) up->port.read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (iflag & (BRKINT |PARMRK )) +if (iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=UART_LSR_BI ;/*
drivers/tty/serial/sunzilog.c +1 -1
@@ -915,7 +915,7 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag, up->port.read_status_mask = Rx_OVR;if (iflag &INPCK ) up->port.read_status_mask |=CRC_ERR |PAR_ERR ; -if (iflag & (BRKINT |PARMRK )) +if (iflag & (IGNBRK |BRKINT |PARMRK )) up->port.read_status_mask |=BRK_ABRT ; up->port.ignore_status_mask =0 ;
drivers/tty/serial/ucc_uart.c +1 -1
@@ -936,7 +936,7 @@ static void qe_uart_set_termios(struct uart_port *port, port->read_status_mask =BD_SC_EMPTY |BD_SC_OV ;if (termios->c_iflag &INPCK ) port->read_status_mask |=BD_SC_FR |BD_SC_PR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=BD_SC_BR ;/*
drivers/tty/serial/vr41xx_siu.c +1 -1
@@ -559,7 +559,7 @@ static void siu_set_termios(struct uart_port *port, struct ktermios *new, port->read_status_mask =UART_LSR_THRE |UART_LSR_OE |UART_LSR_DR ;if (c_iflag &INPCK ) port->read_status_mask |=UART_LSR_FE |UART_LSR_PE ; -if (c_iflag & (BRKINT |PARMRK )) +if (c_iflag & (IGNBRK |BRKINT |PARMRK )) port->read_status_mask |=UART_LSR_BI ; port->ignore_status_mask =0 ;
drivers/tty/serial/zs.c +1 -1
@@ -923,7 +923,7 @@ static void zs_set_termios(struct uart_port *uport, struct ktermios *termios, uport->read_status_mask = Rx_OVR;if (termios->c_iflag &INPCK ) uport->read_status_mask |=FRM_ERR |PAR_ERR ; -if (termios->c_iflag & (BRKINT |PARMRK )) +if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) uport->read_status_mask |= Rx_BRK; uport->ignore_status_mask =0 ;
Signature · 1 line
2.0.0
PATCH 2/2 tty: Correct INPCK handling
If INPCK is not set, input parity detection should be disabled. This means parity errors should not be received from the tty driver, and the data received should be treated normally.
SUS v3, 11.2.2, General Terminal Interface - Input Modes, states:
"If INPCK is set, input parity checking shall be enabled. If INPCK is
not set, input parity checking shall be disabled, allowing output parity generation without input parity errors. Note that whether input parity checking is enabled or disabled is independent of whether parity detection is enabled or disabled (see Control Modes). If parity detection is enabled but input parity checking is disabled, the hardware to which the terminal is connected shall recognize the parity bit, but the terminal special file shall not check whether or not this bit is correctly set."
Ignore parity errors reported by the tty driver when INPCK is not set, and handle the received data normally.
--- drivers/tty/n_tty.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/tty/n_tty.c +10 -9
@@ -1214,15 +1214,16 @@ static void n_tty_receive_parity_error(struct tty_struct *tty, unsigned char c) {struct n_tty_data *ldata = tty->disc_data; -if (I_IGNPAR (tty)) -return ; -if (I_PARMRK (tty)) { -put_tty_queue ('\377' , ldata); -put_tty_queue ('\0' , ldata); -put_tty_queue (c, ldata); - }else if (I_INPCK (tty)) -put_tty_queue ('\0' , ldata); -else +if (I_INPCK (tty)) { +if (I_IGNPAR (tty)) +return ; +if (I_PARMRK (tty)) { +put_tty_queue ('\377' , ldata); +put_tty_queue ('\0' , ldata); +put_tty_queue (c, ldata); + }else +put_tty_queue ('\0' , ldata); + }else put_tty_queue (c, ldata);if (waitqueue_active (&tty->read_wait))wake_up_interruptible (&tty->read_wait);
Signature · 1 line
2.0.0