Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 9d141c1

Browse files
uditkumartigregkh
authored andcommitted
serial: 8250_omap: Implementation of Errata i2310
As per Errata i2310[0], Erroneous timeout can be triggered, if this Erroneous interrupt is not cleared then it may leads to storm of interrupts, therefore apply Errata i2310 solution. [0] https://www.ti.com/lit/pdf/sprz536 page 23 Fixes: b67e830 ("serial: 8250: 8250_omap: Fix possible interrupt storm on K3 SoCs") Cc: stable@vger.kernel.org Signed-off-by: Udit Kumar <u-kumar1@ti.com> Link: https://lore.kernel.org/r/20240619105903.165434-1-u-kumar1@ti.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0ac18da commit 9d141c1

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@
115115
/* RX FIFO occupancy indicator */
116116
#define UART_OMAP_RX_LVL 0x19
117117

118+
/* Timeout low and High */
119+
#define UART_OMAP_TO_L 0x26
120+
#define UART_OMAP_TO_H 0x27
121+
118122
/*
119123
* Copy of the genpd flags for the console.
120124
* Only used if console suspend is disabled
@@ -663,13 +667,24 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)
663667

664668
/*
665669
* On K3 SoCs, it is observed that RX TIMEOUT is signalled after
666-
* FIFO has been drained, in which case a dummy read of RX FIFO
667-
* is required to clear RX TIMEOUT condition.
670+
* FIFO has been drained or erroneously.
671+
* So apply solution of Errata i2310 as mentioned in
672+
* https://www.ti.com/lit/pdf/sprz536
668673
*/
669674
if (priv->habit & UART_RX_TIMEOUT_QUIRK &&
670-
(iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT &&
671-
serial_port_in(port, UART_OMAP_RX_LVL) == 0) {
672-
serial_port_in(port, UART_RX);
675+
(iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT) {
676+
unsigned char efr2, timeout_h, timeout_l;
677+
678+
efr2 = serial_in(up, UART_OMAP_EFR2);
679+
timeout_h = serial_in(up, UART_OMAP_TO_H);
680+
timeout_l = serial_in(up, UART_OMAP_TO_L);
681+
serial_out(up, UART_OMAP_TO_H, 0xFF);
682+
serial_out(up, UART_OMAP_TO_L, 0xFF);
683+
serial_out(up, UART_OMAP_EFR2, UART_OMAP_EFR2_TIMEOUT_BEHAVE);
684+
serial_in(up, UART_IIR);
685+
serial_out(up, UART_OMAP_EFR2, efr2);
686+
serial_out(up, UART_OMAP_TO_H, timeout_h);
687+
serial_out(up, UART_OMAP_TO_L, timeout_l);
673688
}
674689

675690
/* Stop processing interrupts on input overrun */

0 commit comments

Comments
 (0)