Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: make 8250 timeout use the specified IRQ handler

The current 8250 timeout code duplicates the code path in
serial8250_default_handle_irq and then serial8250_handle_irq
i.e. reading iir, check for IIR_NO_INT, and then calling
serial8250_handle_port.

So the immediate thought is to replace the duplicated code
with a call to serial8250_default_handle_irq.

But this highlights a problem. We let 8250 driver variants
use their own IRQ handler via specifying their own custom
->handle_irq, but in the event of a timeout, we ignore their
handler and implicitly run serial8250_default_handle_irq instead.

So, go through the struct to get ->handle_irq and call that,
which for most will still be serial8250_default_handle_irq.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Paul Gortmaker and committed by
Greg Kroah-Hartman
a0431476 3986fb2b

+1 -4
+1 -4
drivers/tty/serial/8250.c
··· 1740 1740 static void serial8250_timeout(unsigned long data) 1741 1741 { 1742 1742 struct uart_8250_port *up = (struct uart_8250_port *)data; 1743 - unsigned int iir; 1744 1743 1745 - iir = serial_in(up, UART_IIR); 1746 - if (!(iir & UART_IIR_NO_INT)) 1747 - serial8250_handle_port(up); 1744 + up->port.handle_irq(&up->port); 1748 1745 mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port)); 1749 1746 } 1750 1747