Skip to content

Commit 93ccbeb

Browse files
pelwellpopcornmix
authored andcommitted
sc16is7xx: Fix for incorrect data being transmitted
UART drivers are meant to use the port spinlock within certain methods, to protect against reentrancy. The sc16is7xx driver does very little locking, presumably because when added it triggers "scheduling while atomic" errors. This is due to the use of mutexes within the regmap abstraction layer, and the mutex implementation's habit of sleeping the current thread while waiting for access. Unfortunately this lack of interlocking can lead to corruption of outbound data, which occurs when the buffer used for I2C transmission is used simultaneously by two threads - a work queue thread running sc16is7xx_tx_proc, and an IRQ thread in sc16is7xx_port_irq, both of which can call sc16is7xx_handle_tx. An earlier patch added efr_lock, a mutex that controls access to the EFR register. This mutex is already claimed in the IRQ handler, and all that is required is to claim the same mutex in sc16is7xx_tx_proc. See: #4885 Signed-off-by: Phil Elwell <[email protected]>
1 parent fa0c23c commit 93ccbeb

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/tty/serial/sc16is7xx.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,12 +737,15 @@ static irqreturn_t sc16is7xx_irq(int irq, void *dev_id)
737737
static void sc16is7xx_tx_proc(struct kthread_work *ws)
738738
{
739739
struct uart_port *port = &(to_sc16is7xx_one(ws, tx_work)->port);
740+
struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
740741

741742
if ((port->rs485.flags & SER_RS485_ENABLED) &&
742743
(port->rs485.delay_rts_before_send > 0))
743744
msleep(port->rs485.delay_rts_before_send);
744745

746+
mutex_lock(&s->efr_lock);
745747
sc16is7xx_handle_tx(port);
748+
mutex_unlock(&s->efr_lock);
746749
}
747750

748751
static void sc16is7xx_reconf_rs485(struct uart_port *port)

0 commit comments

Comments
 (0)