Skip to content

Commit 56dde68

Browse files
committed
Revert "serial: 8250: 8250_omap: Fix possible interrupt storm"
This reverts commit 31fae7c. Tony writes: I just noticed this causes the following regression in Linux next when pressing a key on uart console after boot at least on omap3. This seems to happen on serial_port_in(port, UART_RX) in the quirk handling. So let's drop this. Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Fixes: 31fae7c ("serial: 8250: 8250_omap: Fix possible interrupt storm") Reported-by: Tony Lindgren <[email protected]> Cc: Jan Kiszka <[email protected]> Cc: Vignesh Raghavendra <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9808f9b commit 56dde68

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/tty/serial/8250/8250_omap.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@
104104
#define UART_OMAP_EFR2 0x23
105105
#define UART_OMAP_EFR2_TIMEOUT_BEHAVE BIT(6)
106106

107-
/* RX FIFO occupancy indicator */
108-
#define UART_OMAP_RX_LVL 0x64
109-
110107
struct omap8250_priv {
111108
int line;
112109
u8 habit;
@@ -628,15 +625,6 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)
628625
serial8250_rpm_get(up);
629626
iir = serial_port_in(port, UART_IIR);
630627
ret = serial8250_handle_irq(port, iir);
631-
/*
632-
* It is possible that RX TIMEOUT is signalled after FIFO
633-
* has been drained, in which case a dummy read of RX FIFO is
634-
* required to clear RX TIMEOUT condition.
635-
*/
636-
if ((iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT) {
637-
if (serial_port_in(port, UART_OMAP_RX_LVL) == 0)
638-
serial_port_in(port, UART_RX);
639-
}
640628
serial8250_rpm_put(up);
641629

642630
return IRQ_RETVAL(ret);

0 commit comments

Comments
 (0)