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

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: b67e830d38fa ("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>

authored by

Udit Kumar and committed by
Greg Kroah-Hartman
9d141c1e 0ac18dac

+20 -5
+20 -5
drivers/tty/serial/8250/8250_omap.c
··· 115 115 /* RX FIFO occupancy indicator */ 116 116 #define UART_OMAP_RX_LVL 0x19 117 117 118 + /* Timeout low and High */ 119 + #define UART_OMAP_TO_L 0x26 120 + #define UART_OMAP_TO_H 0x27 121 + 118 122 /* 119 123 * Copy of the genpd flags for the console. 120 124 * Only used if console suspend is disabled ··· 667 663 668 664 /* 669 665 * On K3 SoCs, it is observed that RX TIMEOUT is signalled after 670 - * FIFO has been drained, in which case a dummy read of RX FIFO 671 - * is required to clear RX TIMEOUT condition. 666 + * FIFO has been drained or erroneously. 667 + * So apply solution of Errata i2310 as mentioned in 668 + * https://www.ti.com/lit/pdf/sprz536 672 669 */ 673 670 if (priv->habit & UART_RX_TIMEOUT_QUIRK && 674 - (iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT && 675 - serial_port_in(port, UART_OMAP_RX_LVL) == 0) { 676 - serial_port_in(port, UART_RX); 671 + (iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT) { 672 + unsigned char efr2, timeout_h, timeout_l; 673 + 674 + efr2 = serial_in(up, UART_OMAP_EFR2); 675 + timeout_h = serial_in(up, UART_OMAP_TO_H); 676 + timeout_l = serial_in(up, UART_OMAP_TO_L); 677 + serial_out(up, UART_OMAP_TO_H, 0xFF); 678 + serial_out(up, UART_OMAP_TO_L, 0xFF); 679 + serial_out(up, UART_OMAP_EFR2, UART_OMAP_EFR2_TIMEOUT_BEHAVE); 680 + serial_in(up, UART_IIR); 681 + serial_out(up, UART_OMAP_EFR2, efr2); 682 + serial_out(up, UART_OMAP_TO_H, timeout_h); 683 + serial_out(up, UART_OMAP_TO_L, timeout_l); 677 684 } 678 685 679 686 /* Stop processing interrupts on input overrun */