6.9-stable patches

added patches:
	serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch

diff --git a/queue-6.9/serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch b/queue-6.9/serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch
new file mode 100644 (file)
index 0000000..e96ecb1
--- /dev/null
+++ b/queue-6.9/serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch
@@ -0,0 +1,44 @@
+From c128a1b0523b685c8856ddc0ac0e1caef1fdeee5 Mon Sep 17 00:00:00 2001
+From: Udit Kumar <u-kumar1@ti.com>
+Date: Tue, 25 Jun 2024 21:37:25 +0530
+Subject: serial: 8250_omap: Fix Errata i2310 with RX FIFO level check
+
+From: Udit Kumar <u-kumar1@ti.com>
+
+commit c128a1b0523b685c8856ddc0ac0e1caef1fdeee5 upstream.
+
+Errata i2310[0] says, Erroneous timeout can be triggered,
+if this Erroneous interrupt is not cleared then it may leads
+to storm of interrupts.
+
+Commit 9d141c1e6157 ("serial: 8250_omap: Implementation of Errata i2310")
+which added the workaround but missed ensuring RX FIFO is really empty
+before applying the errata workaround as recommended in the errata text.
+Fix this by adding back check for UART_OMAP_RX_LVL to be 0 for
+workaround to take effect.
+
+[0] https://www.ti.com/lit/pdf/sprz536 page 23
+
+Fixes: 9d141c1e6157 ("serial: 8250_omap: Implementation of Errata i2310")
+Cc: stable@vger.kernel.org
+Reported-by: Vignesh Raghavendra <vigneshr@ti.com>
+Closes: https://lore.kernel.org/all/e96d0c55-0b12-4cbf-9d23-48963543de49@ti.com/
+Signed-off-by: Udit Kumar <u-kumar1@ti.com>
+Link: https://lore.kernel.org/r/20240625160725.2102194-1-u-kumar1@ti.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/serial/8250/8250_omap.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/tty/serial/8250/8250_omap.c
++++ b/drivers/tty/serial/8250/8250_omap.c
+@@ -673,7 +673,8 @@ static irqreturn_t omap8250_irq(int irq,
+        * https://www.ti.com/lit/pdf/sprz536
+        */
+       if (priv->habit & UART_RX_TIMEOUT_QUIRK &&
+-              (iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT) {
++          (iir & UART_IIR_RX_TIMEOUT) == UART_IIR_RX_TIMEOUT &&
++          serial_port_in(port, UART_OMAP_RX_LVL) == 0) {
+               unsigned char efr2, timeout_h, timeout_l;
+ 
+               efr2 = serial_in(up, UART_OMAP_EFR2);

diff --git a/queue-6.9/series b/queue-6.9/series
index d2f3ce748752100634c4212c8f7a5f64e773f829..a8635c7ee6a0ab7a5ae3013941ac9991b72e2e82 100644 (file)
--- a/queue-6.9/series
+++ b/queue-6.9/series
@@ -221,3 +221,4 @@ cxl-region-check-interleave-capability.patch
 netfs-fix-netfs_page_mkwrite-to-check-folio-mapping-.patch
 netfs-fix-netfs_page_mkwrite-to-flush-conflicting-da.patch
 serial-imx-only-set-receiver-level-if-it-is-zero.patch
+serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch