Skip to content

Commit 54c4ec5

Browse files
ekronborggregkh
authored andcommitted
serial: mxs-auart: add spinlock around changing cts state
The uart_handle_cts_change() function in serial_core expects the caller to hold uport->lock. For example, I have seen the below kernel splat, when the Bluetooth driver is loaded on an i.MX28 board. [ 85.119255] ------------[ cut here ]------------ [ 85.124413] WARNING: CPU: 0 PID: 27 at /drivers/tty/serial/serial_core.c:3453 uart_handle_cts_change+0xb4/0xec [ 85.134694] Modules linked in: hci_uart bluetooth ecdh_generic ecc wlcore_sdio configfs [ 85.143314] CPU: 0 PID: 27 Comm: kworker/u3:0 Not tainted 6.6.3-00021-gd62a2f068f92 #1 [ 85.151396] Hardware name: Freescale MXS (Device Tree) [ 85.156679] Workqueue: hci0 hci_power_on [bluetooth] (...) [ 85.191765] uart_handle_cts_change from mxs_auart_irq_handle+0x380/0x3f4 [ 85.198787] mxs_auart_irq_handle from __handle_irq_event_percpu+0x88/0x210 (...) Cc: [email protected] Fixes: 4d90bb1 ("serial: core: Document and assert lock requirements for irq helpers") Reviewed-by: Frank Li <[email protected]> Signed-off-by: Emil Kronborg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7dfae6c commit 54c4ec5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/tty/serial/mxs-auart.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,11 +1086,13 @@ static void mxs_auart_set_ldisc(struct uart_port *port,
10861086

10871087
static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
10881088
{
1089-
u32 istat;
1089+
u32 istat, stat;
10901090
struct mxs_auart_port *s = context;
10911091
u32 mctrl_temp = s->mctrl_prev;
1092-
u32 stat = mxs_read(s, REG_STAT);
10931092

1093+
uart_port_lock(&s->port);
1094+
1095+
stat = mxs_read(s, REG_STAT);
10941096
istat = mxs_read(s, REG_INTR);
10951097

10961098
/* ack irq */
@@ -1126,6 +1128,8 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context)
11261128
istat &= ~AUART_INTR_TXIS;
11271129
}
11281130

1131+
uart_port_unlock(&s->port);
1132+
11291133
return IRQ_HANDLED;
11301134
}
11311135

0 commit comments

Comments
 (0)