FAILED: patch "[PATCH] serial: 8250_omap: Fix Errata i2310 with RX FIFO level check" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x c128a1b0523b685c8856ddc0ac0e1caef1fdeee5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024070338-skid-sauna-cd1d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c128a1b0523b685c8856ddc0ac0e1caef1fdeee5 Mon Sep 17 00:00:00 2001
From: Udit Kumar <[email protected]>
Date: Tue, 25 Jun 2024 21:37:25 +0530
Subject: [PATCH] serial: 8250_omap: Fix Errata i2310 with RX FIFO level check
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
drivers/tty/serial/8250/8250_omap.c +2 -1
@@ -672,7 +672,8 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)* 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 );
Hello Greg
Quoted 7 lines · On 7/3/2024 7:41 PM, [email protected] wrote:
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.To reproduce the conflict and resubmit, you may use the following commands:
Quoted 8 lines
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkoutFETCH_HEAD
git cherry-pick -xc128a1b0523b685c8856ddc0ac0e1caef1fdeee5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024070338-skid-sauna-cd1d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..Possible dependencies:
This patch has dependency on https://lore.kernel.org/all/[email protected]/ Which is already queued for 5.15.
Quoted 48 lines
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From
c128a1b0523b685c8856ddc0ac0e1caef1fdeee5Mon Sep 17 00:00:00 2001
From: Udit Kumar <[email protected]>
Date: Tue, 25 Jun 2024 21:37:25 +0530
Subject: [PATCH] serial: 8250_omap: Fix Errata i2310 with RX FIFO level checkErrata 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 forUART_OMAP_RX_LVLto 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")Reported-by Vignesh Raghavendra <[email protected]>Signed-off-by Udit Kumar <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>drivers/tty/serial/8250/8250_omap.c +2
-1@@ -672,7 +672,8 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)* 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 );
Greg KH
maintainerQuoted 17 lines · Udit
Hello Greg
Quoted 14 lines · On 7/3/2024 7:41 PM, [email protected] wrote:
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkoutFETCH_HEAD
git cherry-pick -xc128a1b0523b685c8856ddc0ac0e1caef1fdeee5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024070338-skid-sauna-cd1d@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Quoted 6 lines
Quoted 1 line
Possible dependencies:
This patch has dependency on
https://lore.kernel.org/all/[email protected]/
Which is already queued for 5.15.
Oops, my fault, I hadn't applied all of the 5.15.y patches when I attempted this one, now fixed.
greg k-h