From: Biju Das <biju.das.jz@bp.renesas.com>

On RSCI IP, a deadlock occurs during a FIFO overrun error, as it uses a
different register to clear the FIFO overrun error status.

Cc: stable@kernel.org
Fixes: 0666e3fe95ab ("serial: sh-sci: Add support for RZ/T2H SCI")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v1->v2:
 * Split the fixes patches from original series.
---
 drivers/tty/serial/rsci.c          | 1 +
 drivers/tty/serial/sh-sci-common.h | 1 +
 drivers/tty/serial/sh-sci.c        | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/rsci.c b/drivers/tty/serial/rsci.c
index b3c48dc1e07d..3e1f4b3c4e59 100644
--- a/drivers/tty/serial/rsci.c
+++ b/drivers/tty/serial/rsci.c
@@ -414,6 +414,7 @@ static const struct sci_port_params_bits rsci_port_param_bits = {
 	.rxtx_enable = CCR0_RE | CCR0_TE,
 	.te_clear = CCR0_TE | CCR0_TEIE,
 	.poll_sent_bits = CSR_TDRE | CSR_TEND,
+	.overrun_clr = CFCLR_ORERC,
 };
 
 static const struct sci_port_params rsci_port_params = {
diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci-common.h
index e3c028df14f1..bcdb41ddc15d 100644
--- a/drivers/tty/serial/sh-sci-common.h
+++ b/drivers/tty/serial/sh-sci-common.h
@@ -51,6 +51,7 @@ struct sci_port_params_bits {
 	unsigned int rxtx_enable;
 	unsigned int te_clear;
 	unsigned int poll_sent_bits;
+	unsigned int overrun_clr;
 };
 
 struct sci_common_regs {
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 62bb62b82cbe..b33894d0273b 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1024,8 +1024,12 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
 
 	status = s->ops->read_reg(port, s->params->overrun_reg);
 	if (status & s->params->overrun_mask) {
-		status &= ~s->params->overrun_mask;
-		s->ops->write_reg(port, s->params->overrun_reg, status);
+		if (s->type == SCI_PORT_RSCI) {
+			s->ops->clear_SCxSR(port, s->params->param_bits->overrun_clr);
+		} else {
+			status &= ~s->params->overrun_mask;
+			s->ops->write_reg(port, s->params->overrun_reg, status);
+		}
 
 		port->icount.overrun++;
 
-- 
2.43.0

Hi Biju,

On Wed, 29 Oct 2025 at 09:21, Biju <biju.das.au@gmail.com> wrote:
> From: Biju Das <biju.das.jz@bp.renesas.com>
>
> On RSCI IP, a deadlock occurs during a FIFO overrun error, as it uses a
> different register to clear the FIFO overrun error status.
>
> Cc: stable@kernel.org
> Fixes: 0666e3fe95ab ("serial: sh-sci: Add support for RZ/T2H SCI")
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

Thanks for your patch!

> --- a/drivers/tty/serial/rsci.c
> +++ b/drivers/tty/serial/rsci.c
> @@ -414,6 +414,7 @@ static const struct sci_port_params_bits rsci_port_param_bits = {
>         .rxtx_enable = CCR0_RE | CCR0_TE,
>         .te_clear = CCR0_TE | CCR0_TEIE,
>         .poll_sent_bits = CSR_TDRE | CSR_TEND,
> +       .overrun_clr = CFCLR_ORERC,
>  };
>
>  static const struct sci_port_params rsci_port_params = {
> diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci-common.h
> index e3c028df14f1..bcdb41ddc15d 100644
> --- a/drivers/tty/serial/sh-sci-common.h
> +++ b/drivers/tty/serial/sh-sci-common.h
> @@ -51,6 +51,7 @@ struct sci_port_params_bits {
>         unsigned int rxtx_enable;
>         unsigned int te_clear;
>         unsigned int poll_sent_bits;
> +       unsigned int overrun_clr;

I don't really see a need to add this field, as there are two alternatives...

>  };
>
>  struct sci_common_regs {
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 62bb62b82cbe..b33894d0273b 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -1024,8 +1024,12 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
>
>         status = s->ops->read_reg(port, s->params->overrun_reg);
>         if (status & s->params->overrun_mask) {
> -               status &= ~s->params->overrun_mask;
> -               s->ops->write_reg(port, s->params->overrun_reg, status);
> +               if (s->type == SCI_PORT_RSCI) {
> +                       s->ops->clear_SCxSR(port, s->params->param_bits->overrun_clr);

1. You can just use CFCLR_ORERC directly here,
2. All of the CFCLR_*C clearing bits match the corresponding CSR_*
   status bits, so you could do without the former, and thus use
   params->overrun_mask here, too.

> +               } else {
> +                       status &= ~s->params->overrun_mask;
> +                       s->ops->write_reg(port, s->params->overrun_reg, status);
> +               }
>
>                 port->icount.overrun++;
>

BTW, how is this related to "[PATCH] tty: serial: sh-sci: fix RSCI
FIFO overrun handling" [1], which is already applied (and which I
still don't fully understand the big picture behind. I'll reply there)?

[1] https://lore.kernel.org/20250923154707.1089900-1-cosmin-gabriel.tanislav.xa@renesas.com
    commit ef8fef45c74b5a00 ("tty: serial: sh-sci: fix RSCI FIFO
    overrun handling") in v6.18-rc3.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds