FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-11 14:26:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tty: serial: msm_serial: avoid system lockup condition

Browse Source 
The function msm_wait_for_xmitr can be taken with interrupts
disabled. In order to avoid a potential system lockup - demonstrated
under stress testing conditions on SoC QCS404/5 - make sure we wait
for a bounded amount of time.

Tested on SoC QCS404.

Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jorge Ramirez-Ortiz 2019-06-10 19:23:08 +02:00 committed by Greg Kroah-Hartman
parent db1b5bc047
commit ba3684f99f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/tty/serial/msm_serial.c
View File

@ -383,10 +383,14 @@ no_rx:
static inline void msm_wait_for_xmitr(struct uart_port *port) static inline void msm_wait_for_xmitr(struct uart_port *port)
{ {
unsigned int timeout = 500000;
while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) { while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) {
if (msm_read(port, UART_ISR) & UART_ISR_TX_READY) if (msm_read(port, UART_ISR) & UART_ISR_TX_READY)
break; break;
udelay(1); udelay(1);
if (!timeout--)
break;
} }
msm_write(port, UART_CR_CMD_RESET_TX_READY, UART_CR); msm_write(port, UART_CR_CMD_RESET_TX_READY, UART_CR);
} }