Skip to content

Commit e14829d

Browse files
ldtsgregkh
authored andcommitted
tty: serial: msm_serial: avoid system lockup condition
[ Upstream commit ba3684f ] 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>
1 parent d6ad3a0 commit e14829d

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/tty/serial/msm_serial.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,14 @@ static void msm_request_rx_dma(struct msm_port *msm_port, resource_size_t base)
222222

223223
static inline void msm_wait_for_xmitr(struct uart_port *port)
224224
{
225+
unsigned int timeout = 500000;
226+
225227
while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) {
226228
if (msm_read(port, UART_ISR) & UART_ISR_TX_READY)
227229
break;
228230
udelay(1);
231+
if (!timeout--)
232+
break;
229233
}
230234
msm_write(port, UART_CR_CMD_RESET_TX_READY, UART_CR);
231235
}

0 commit comments

Comments
 (0)