serial: 8250_omap: Implementation of Errata i2310
Subsystems (2)
PATCH v4 1/1 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
---
Test logs:
https://gist.github.com/uditkumarti/48e239540db4e761861fbd1d7d31cfed
Change logs
Changes in v4:
- Reverted fifo empty check before applying errata Link to v3:
https://lore.kernel.org/all/[email protected]/
Changes in v3:
- CC stable in commit message
Link to v2:
https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Added Fixes Tag and typo correction in commit message
- Corrected bit position to UART_OMAP_EFR2_TIMEOUT_BEHAVE Link to v1
https://lore.kernel.org/all/[email protected]/
drivers/tty/serial/8250/8250_omap.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_omap.c +19 -3
@@ -115,6 +115,10 @@/* RX FIFO occupancy indicator */ #define UART_OMAP_RX_LVL 0x19 +/* Timeout low and High */ +#define UART_OMAP_TO_L 0x26 +#define UART_OMAP_TO_H 0x27 +/* * Copy of the genpd flags for the console. * Only used if console suspend is disabled
@@ -663,13 +667,25 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)/* * On K3 SoCs, it is observed that RX TIMEOUT is signalled after -* FIFO has been drained, in which case a dummy read of RX FIFO -* is required to clear RX TIMEOUT condition. +* FIFO has been drained or erroneously. +* So apply solution of Errata i2310 as mentioned in +* https://www.ti.com/lit/pdf/sprz536 */ if (priv->habit &UART_RX_TIMEOUT_QUIRK && (iir &UART_IIR_RX_TIMEOUT ) ==UART_IIR_RX_TIMEOUT &&serial_port_in (port,UART_OMAP_RX_LVL ) ==0 ) { -serial_port_in (port,UART_RX ); +unsigned char efr2, timeout_h, timeout_l; + + efr2 =serial_in (up,UART_OMAP_EFR2 ); + timeout_h =serial_in (up,UART_OMAP_TO_H ); + timeout_l =serial_in (up,UART_OMAP_TO_L ); +serial_out (up,UART_OMAP_TO_H ,0xFF ); +serial_out (up,UART_OMAP_TO_L ,0xFF ); +serial_out (up,UART_OMAP_EFR2 ,UART_OMAP_EFR2_TIMEOUT_BEHAVE ); +serial_in (up,UART_IIR ); +serial_out (up,UART_OMAP_EFR2 , efr2); +serial_out (up,UART_OMAP_TO_H , timeout_h); +serial_out (up,UART_OMAP_TO_L , timeout_l); }/* Stop processing interrupts on input overrun */
Signature · 1 line
2.34.1
Quoted 10 lines · Udit Kumar
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")Signed-off-by Udit Kumar <[email protected]>---
[...]
Quoted 35 lines
drivers/tty/serial/8250/8250_omap.c +12
-3@@ -115,6 +115,10 @@/* RX FIFO occupancy indicator */ #define UART_OMAP_RX_LVL 0x19 +/* Timeout low and High */ +#define UART_OMAP_TO_L 0x26 +#define UART_OMAP_TO_H 0x27 +/* * Copy of the genpd flags for the console. * Only used if console suspend is disabled @@ -663,13 +667,25 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)/* * On K3 SoCs, it is observed that RX TIMEOUT is signalled after -* FIFO has been drained, in which case a dummy read of RX FIFO -* is required to clear RX TIMEOUT condition. +* FIFO has been drained or erroneously. +* So apply solution of Errata i2310 as mentioned in +* https://www.ti.com/lit/pdf/sprz536 */ if (priv->habit &UART_RX_TIMEOUT_QUIRK && (iir &UART_IIR_RX_TIMEOUT ) ==UART_IIR_RX_TIMEOUT &&serial_port_in (port,UART_OMAP_RX_LVL ) ==0 ) { -serial_port_in (port,UART_RX ); +unsigned char efr2, timeout_h, timeout_l; + + efr2 =serial_in (up,UART_OMAP_EFR2 ); + timeout_h =serial_in (up,UART_OMAP_TO_H ); + timeout_l =serial_in (up,UART_OMAP_TO_L );
drivers/tty/serial/8250/8250_omap.c static irqreturn_t omap8250_irq(int irq, void *dev_id) · line 691
Quoted 10 lines
drivers/tty/serial/8250/8250_omap.c +7
-0+serial_out (up,UART_OMAP_TO_H ,0xFF ); +serial_out (up,UART_OMAP_TO_L ,0xFF ); +serial_out (up,UART_OMAP_EFR2 ,UART_OMAP_EFR2_TIMEOUT_BEHAVE ); +serial_in (up,UART_IIR ); +serial_out (up,UART_OMAP_EFR2 , efr2); +serial_out (up,UART_OMAP_TO_H , timeout_h); +serial_out (up,UART_OMAP_TO_L , timeout_l); }/* Stop processing interrupts on input overrun */
Greg KH
maintainerQuoted 9 lines · Udit Kumar
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")Signed-off-by Udit Kumar <[email protected]>
As I have already taken the v3 patch to my tree, please send a "fix" patch on top of it, as I can not rebase a public tree.
thanks,
greg k-h
Thanks Greg
Quoted 5 lines · Greg KH
Quoted 4 lines · Udit Kumar
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.
Quoted 7 lines
Quoted 5 lines
[0] https://www.ti.com/lit/pdf/sprz536 page 23
Fixes b67e830d38fa ("serial: 8250: 8250_omap: Fix possible interrupt storm on K3 SoCs")Signed-off-by Udit Kumar <[email protected]>As I have already taken the v3 patch to my tree, please send a "fix" patch on top of it, as I can not rebase a public tree.
I posted delta patch on top
https://lore.kernel.org/all/[email protected]/
Quoted 3 lines
thanks,
greg k-h