Commit 15b82b46 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Pierre Ossman

sdio: fix recursion issues between sdio-uart driver and tty layer

In a few places, sdio_uart_irq() is called directly instead of waiting
for the actual interrupt to be raised and the SDIO IRQ thread scheduled
in order to reduce latency.  However, some interaction with the tty core
may end up calling us back (serial echo, flow control, etc.) creating
two issues:

 - the host lock gets claimed twice from the same thread causing a
   deadlock;

 - the same direct calls to sdio_uart_irq() may be performed causing
   unexpected reentrancy into the IRQ handler.

This patch handles both of those issues.
Signed-off-by: default avatarNicolas Pitre <npitre@mvista.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 2ba30eed
...@@ -79,6 +79,7 @@ struct sdio_uart_port { ...@@ -79,6 +79,7 @@ struct sdio_uart_port {
struct mutex open_lock; struct mutex open_lock;
struct sdio_func *func; struct sdio_func *func;
struct mutex func_lock; struct mutex func_lock;
struct task_struct *in_sdio_uart_irq;
unsigned int regs_offset; unsigned int regs_offset;
struct circ_buf xmit; struct circ_buf xmit;
spinlock_t write_lock; spinlock_t write_lock;
...@@ -186,6 +187,7 @@ static int sdio_uart_claim_func(struct sdio_uart_port *port) ...@@ -186,6 +187,7 @@ static int sdio_uart_claim_func(struct sdio_uart_port *port)
mutex_unlock(&port->func_lock); mutex_unlock(&port->func_lock);
return -ENODEV; return -ENODEV;
} }
if (likely(port->in_sdio_uart_irq != current))
sdio_claim_host(port->func); sdio_claim_host(port->func);
mutex_unlock(&port->func_lock); mutex_unlock(&port->func_lock);
return 0; return 0;
...@@ -193,6 +195,7 @@ static int sdio_uart_claim_func(struct sdio_uart_port *port) ...@@ -193,6 +195,7 @@ static int sdio_uart_claim_func(struct sdio_uart_port *port)
static inline void sdio_uart_release_func(struct sdio_uart_port *port) static inline void sdio_uart_release_func(struct sdio_uart_port *port)
{ {
if (likely(port->in_sdio_uart_irq != current))
sdio_release_host(port->func); sdio_release_host(port->func);
} }
...@@ -511,15 +514,29 @@ static void sdio_uart_irq(struct sdio_func *func) ...@@ -511,15 +514,29 @@ static void sdio_uart_irq(struct sdio_func *func)
struct sdio_uart_port *port = sdio_get_drvdata(func); struct sdio_uart_port *port = sdio_get_drvdata(func);
unsigned int iir, lsr; unsigned int iir, lsr;
/*
* In a few places sdio_uart_irq() is called directly instead of
* waiting for the actual interrupt to be raised and the SDIO IRQ
* thread scheduled in order to reduce latency. However, some
* interaction with the tty core may end up calling us back
* (serial echo, flow control, etc.) through those same places
* causing undesirable effects. Let's stop the recursion here.
*/
if (unlikely(port->in_sdio_uart_irq == current))
return;
iir = sdio_in(port, UART_IIR); iir = sdio_in(port, UART_IIR);
if (iir & UART_IIR_NO_INT) if (iir & UART_IIR_NO_INT)
return; return;
port->in_sdio_uart_irq = current;
lsr = sdio_in(port, UART_LSR); lsr = sdio_in(port, UART_LSR);
if (lsr & UART_LSR_DR) if (lsr & UART_LSR_DR)
sdio_uart_receive_chars(port, &lsr); sdio_uart_receive_chars(port, &lsr);
sdio_uart_check_modem_status(port); sdio_uart_check_modem_status(port);
if (lsr & UART_LSR_THRE) if (lsr & UART_LSR_THRE)
sdio_uart_transmit_chars(port); sdio_uart_transmit_chars(port);
port->in_sdio_uart_irq = NULL;
} }
static int sdio_uart_startup(struct sdio_uart_port *port) static int sdio_uart_startup(struct sdio_uart_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment