diff options
| author | Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> | 2019-06-10 19:23:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-31 07:24:38 +0200 |
| commit | f3399d6e5def2877ad6febd973012a9816b5e3ba (patch) | |
| tree | 42833c6033b7e950b90d663f0a04a7b5832f0a4a /drivers/tty/serial | |
| parent | f0728a6e34ee4dbb846945824d582ad258eca99a (diff) | |
| download | linux-stable-f3399d6e5def2877ad6febd973012a9816b5e3ba.tar.gz linux-stable-f3399d6e5def2877ad6febd973012a9816b5e3ba.tar.bz2 linux-stable-f3399d6e5def2877ad6febd973012a9816b5e3ba.zip | |
tty: serial: msm_serial: avoid system lockup condition
[ Upstream commit ba3684f99f1b25d2a30b6956d02d339d7acb9799 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/msm_serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 23833ad952ba..3657a24913fc 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -383,10 +383,14 @@ no_rx: 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)) { if (msm_read(port, UART_ISR) & UART_ISR_TX_READY) break; udelay(1); + if (!timeout--) + break; } msm_write(port, UART_CR_CMD_RESET_TX_READY, UART_CR); } |