All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
@ 2014-12-15 14:14 ` Yoshihiro Kaneko
  0 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Kaneko @ 2014-12-15 14:14 UTC (permalink / raw)
  To: linux-serial; +Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, linux-sh

From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>

When fifo overrun happened, the interrupt status refers to
SCLSR register in R-Car SCIF and HSCIF.
Thus, overrun handling takes SCLSR register into account.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---

This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
tree.

 drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1110523..ff549a8 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
 		/* overrun error */
 		if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
 			copied++;
-
-		dev_notice(port->dev, "overrun error\n");
 	}
 
 	if (status & SCxSR_FER(port)) {
@@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
 
 		if (tty_insert_flip_char(tport, 0, TTY_PARITY))
 			copied++;
-
-		dev_notice(port->dev, "parity error\n");
 	}
 
 	if (copied)
@@ -1002,12 +998,15 @@ static inline unsigned long port_rx_irq_mask(struct uart_port *port)
 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 {
 	unsigned short ssr_status, scr_status, err_enabled;
+	unsigned short slr_status = 0;
 	struct uart_port *port = ptr;
 	struct sci_port *s = to_sci_port(port);
 	irqreturn_t ret = IRQ_NONE;
 
 	ssr_status = serial_port_in(port, SCxSR);
 	scr_status = serial_port_in(port, SCSCR);
+	if (port->type = PORT_SCIF || port->type = PORT_HSCIF)
+		slr_status = serial_port_in(port, SCLSR);
 	err_enabled = scr_status & port_rx_irq_mask(port);
 
 	/* Tx Interrupt */
@@ -1020,8 +1019,11 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 	 * DR flags
 	 */
 	if (((ssr_status & SCxSR_RDxF(port)) || s->chan_rx) &&
-	    (scr_status & SCSCR_RIE))
+	    (scr_status & SCSCR_RIE)) {
+		if (port->type = PORT_SCIF || port->type = PORT_HSCIF)
+			sci_handle_fifo_overrun(port);
 		ret = sci_rx_interrupt(irq, ptr);
+	}
 
 	/* Error Interrupt */
 	if ((ssr_status & SCxSR_ERRORS(port)) && err_enabled)
@@ -1031,6 +1033,12 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 	if ((ssr_status & SCxSR_BRK(port)) && err_enabled)
 		ret = sci_br_interrupt(irq, ptr);
 
+	/* Overrun Interrupt */
+	if (port->type = PORT_SCIF || port->type = PORT_HSCIF) {
+		if ((slr_status & 0x01))
+			sci_handle_fifo_overrun(port);
+	}
+
 	return ret;
 }
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
@ 2014-12-15 14:14 ` Yoshihiro Kaneko
  0 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Kaneko @ 2014-12-15 14:14 UTC (permalink / raw)
  To: linux-serial; +Cc: Greg Kroah-Hartman, Simon Horman, Magnus Damm, linux-sh

From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>

When fifo overrun happened, the interrupt status refers to
SCLSR register in R-Car SCIF and HSCIF.
Thus, overrun handling takes SCLSR register into account.

Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---

This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
tree.

 drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1110523..ff549a8 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
 		/* overrun error */
 		if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
 			copied++;
-
-		dev_notice(port->dev, "overrun error\n");
 	}
 
 	if (status & SCxSR_FER(port)) {
@@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
 
 		if (tty_insert_flip_char(tport, 0, TTY_PARITY))
 			copied++;
-
-		dev_notice(port->dev, "parity error\n");
 	}
 
 	if (copied)
@@ -1002,12 +998,15 @@ static inline unsigned long port_rx_irq_mask(struct uart_port *port)
 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 {
 	unsigned short ssr_status, scr_status, err_enabled;
+	unsigned short slr_status = 0;
 	struct uart_port *port = ptr;
 	struct sci_port *s = to_sci_port(port);
 	irqreturn_t ret = IRQ_NONE;
 
 	ssr_status = serial_port_in(port, SCxSR);
 	scr_status = serial_port_in(port, SCSCR);
+	if (port->type == PORT_SCIF || port->type == PORT_HSCIF)
+		slr_status = serial_port_in(port, SCLSR);
 	err_enabled = scr_status & port_rx_irq_mask(port);
 
 	/* Tx Interrupt */
@@ -1020,8 +1019,11 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 	 * DR flags
 	 */
 	if (((ssr_status & SCxSR_RDxF(port)) || s->chan_rx) &&
-	    (scr_status & SCSCR_RIE))
+	    (scr_status & SCSCR_RIE)) {
+		if (port->type == PORT_SCIF || port->type == PORT_HSCIF)
+			sci_handle_fifo_overrun(port);
 		ret = sci_rx_interrupt(irq, ptr);
+	}
 
 	/* Error Interrupt */
 	if ((ssr_status & SCxSR_ERRORS(port)) && err_enabled)
@@ -1031,6 +1033,12 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 	if ((ssr_status & SCxSR_BRK(port)) && err_enabled)
 		ret = sci_br_interrupt(irq, ptr);
 
+	/* Overrun Interrupt */
+	if (port->type == PORT_SCIF || port->type == PORT_HSCIF) {
+		if ((slr_status & 0x01))
+			sci_handle_fifo_overrun(port);
+	}
+
 	return ret;
 }
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
  2014-12-15 14:14 ` Yoshihiro Kaneko
@ 2015-01-22  4:51   ` Nobuhiro Iwamatsu
  -1 siblings, 0 replies; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-01-22  4:51 UTC (permalink / raw)
  To: Yoshihiro Kaneko
  Cc: linux-serial, Greg Kroah-Hartman, Simon Horman, Magnus Damm, Linux-sh

Hi,

2014-12-15 23:14 GMT+09:00 Yoshihiro Kaneko <ykaneko0929@gmail.com>:
> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>
> When fifo overrun happened, the interrupt status refers to
> SCLSR register in R-Car SCIF and HSCIF.
> Thus, overrun handling takes SCLSR register into account.
>
> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
> tree.
>
>  drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 1110523..ff549a8 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
>                 /* overrun error */
>                 if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
>                         copied++;
> -
> -               dev_notice(port->dev, "overrun error\n");
>         }
>
>         if (status & SCxSR_FER(port)) {
> @@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
>
>                 if (tty_insert_flip_char(tport, 0, TTY_PARITY))
>                         copied++;
> -
> -               dev_notice(port->dev, "parity error\n");
>         }

I think that these fixis unrelated to support of HSCIF.
Please split patch.

Best regards,
  Nobuhiro


-- 
Nobuhiro Iwamatsu

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
@ 2015-01-22  4:51   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 6+ messages in thread
From: Nobuhiro Iwamatsu @ 2015-01-22  4:51 UTC (permalink / raw)
  To: Yoshihiro Kaneko
  Cc: linux-serial, Greg Kroah-Hartman, Simon Horman, Magnus Damm, Linux-sh

Hi,

2014-12-15 23:14 GMT+09:00 Yoshihiro Kaneko <ykaneko0929@gmail.com>:
> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>
> When fifo overrun happened, the interrupt status refers to
> SCLSR register in R-Car SCIF and HSCIF.
> Thus, overrun handling takes SCLSR register into account.
>
> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
> tree.
>
>  drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 1110523..ff549a8 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
>                 /* overrun error */
>                 if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
>                         copied++;
> -
> -               dev_notice(port->dev, "overrun error\n");
>         }
>
>         if (status & SCxSR_FER(port)) {
> @@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
>
>                 if (tty_insert_flip_char(tport, 0, TTY_PARITY))
>                         copied++;
> -
> -               dev_notice(port->dev, "parity error\n");
>         }

I think that these fixis unrelated to support of HSCIF.
Please split patch.

Best regards,
  Nobuhiro


-- 
Nobuhiro Iwamatsu

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
  2015-01-22  4:51   ` Nobuhiro Iwamatsu
@ 2015-01-25 11:10     ` Yoshihiro Kaneko
  -1 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Kaneko @ 2015-01-25 11:10 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu
  Cc: linux-serial, Greg Kroah-Hartman, Simon Horman, Magnus Damm, Linux-sh

Hi,

Thanks for your review.

2015-01-22 13:51 GMT+09:00 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
> Hi,
>
> 2014-12-15 23:14 GMT+09:00 Yoshihiro Kaneko <ykaneko0929@gmail.com>:
>> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>>
>> When fifo overrun happened, the interrupt status refers to
>> SCLSR register in R-Car SCIF and HSCIF.
>> Thus, overrun handling takes SCLSR register into account.
>>
>> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>> ---
>>
>> This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
>> tree.
>>
>>  drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
>>  1 file changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
>> index 1110523..ff549a8 100644
>> --- a/drivers/tty/serial/sh-sci.c
>> +++ b/drivers/tty/serial/sh-sci.c
>> @@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
>>                 /* overrun error */
>>                 if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
>>                         copied++;
>> -
>> -               dev_notice(port->dev, "overrun error\n");
>>         }
>>
>>         if (status & SCxSR_FER(port)) {
>> @@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
>>
>>                 if (tty_insert_flip_char(tport, 0, TTY_PARITY))
>>                         copied++;
>> -
>> -               dev_notice(port->dev, "parity error\n");
>>         }
>
> I think that these fixis unrelated to support of HSCIF.
> Please split patch.

I got it.
I'll update this patch.

Thanks,
Kaneko

>
> Best regards,
>   Nobuhiro
>
>
> --
> Nobuhiro Iwamatsu

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling
@ 2015-01-25 11:10     ` Yoshihiro Kaneko
  0 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Kaneko @ 2015-01-25 11:10 UTC (permalink / raw)
  To: Nobuhiro Iwamatsu
  Cc: linux-serial, Greg Kroah-Hartman, Simon Horman, Magnus Damm, Linux-sh

Hi,

Thanks for your review.

2015-01-22 13:51 GMT+09:00 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
> Hi,
>
> 2014-12-15 23:14 GMT+09:00 Yoshihiro Kaneko <ykaneko0929@gmail.com>:
>> From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>>
>> When fifo overrun happened, the interrupt status refers to
>> SCLSR register in R-Car SCIF and HSCIF.
>> Thus, overrun handling takes SCLSR register into account.
>>
>> Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
>> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>> ---
>>
>> This patch is based on the tty-next branch of Greg Kroah-Hartman's tty
>> tree.
>>
>>  drivers/tty/serial/sh-sci.c | 18 +++++++++++++-----
>>  1 file changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
>> index 1110523..ff549a8 100644
>> --- a/drivers/tty/serial/sh-sci.c
>> +++ b/drivers/tty/serial/sh-sci.c
>> @@ -793,8 +793,6 @@ static int sci_handle_errors(struct uart_port *port)
>>                 /* overrun error */
>>                 if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
>>                         copied++;
>> -
>> -               dev_notice(port->dev, "overrun error\n");
>>         }
>>
>>         if (status & SCxSR_FER(port)) {
>> @@ -835,8 +833,6 @@ static int sci_handle_errors(struct uart_port *port)
>>
>>                 if (tty_insert_flip_char(tport, 0, TTY_PARITY))
>>                         copied++;
>> -
>> -               dev_notice(port->dev, "parity error\n");
>>         }
>
> I think that these fixis unrelated to support of HSCIF.
> Please split patch.

I got it.
I'll update this patch.

Thanks,
Kaneko

>
> Best regards,
>   Nobuhiro
>
>
> --
> Nobuhiro Iwamatsu

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-25 11:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-15 14:14 [PATCH/RFC] serial: sh-sci: Fix R-Car SCIF and HSCIF overrun handling Yoshihiro Kaneko
2014-12-15 14:14 ` Yoshihiro Kaneko
2015-01-22  4:51 ` Nobuhiro Iwamatsu
2015-01-22  4:51   ` Nobuhiro Iwamatsu
2015-01-25 11:10   ` Yoshihiro Kaneko
2015-01-25 11:10     ` Yoshihiro Kaneko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.