[PATCH] tty: serial: uartlite: Specify time for sending chars

[PATCH] tty: serial: uartlite: Specify time for sending chars

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]

Xilinx MDM (Microblaze Debug Module) also contains
uart interface via JTAG which is compatible with
uartlite driver. This interface is really slow
that's why timeout is setup to 1s.

Make this time delay not to be cpu speed dependent.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

RFC sent here:
https://lkml.org/lkml/2013/9/30/250
I finally got HW design which is just slow to be able
to test it.

---
 drivers/tty/serial/uartlite.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 5f90ef24d475..723a6b79cd14 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -418,14 +418,20 @@ static struct uart_ops ulite_ops = {
 #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 static void ulite_console_wait_tx(struct uart_port *port)
 {
-	int i;
 	u8 val;
+	unsigned long timeout;

 	/* Spin waiting for TX fifo to have space available */
-	for (i = 0; i < 100000; i++) {
+	timeout = jiffies + msecs_to_jiffies(1000);
+	while (1) {
 		val = uart_in32(ULITE_STATUS, port);
 		if ((val & ULITE_STATUS_TXFULL) == 0)
 			break;
+		if (time_after(jiffies, timeout)) {
+			dev_warn(port->dev,
+				 "timeout waiting for TX buffer empty\n");
+			break;
+		}
 		cpu_relax();
 	}
 }
--
1.8.2.3


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] tty: serial: uartlite: Specify time for sending chars

[Peter Korsgaard]

>>>>> "Michal" == Michal Simek <michal.simek@xilinx.com> writes:

 > Xilinx MDM (Microblaze Debug Module) also contains
 > uart interface via JTAG which is compatible with
 > uartlite driver. This interface is really slow
 > that's why timeout is setup to 1s.

 > Make this time delay not to be cpu speed dependent.

 > Signed-off-by: Michal Simek <michal.simek@xilinx.com>
 > ---

 > RFC sent here:
 > https://lkml.org/lkml/2013/9/30/250
 > I finally got HW design which is just slow to be able
 > to test it.

 > ---
 >  drivers/tty/serial/uartlite.c | 10 ++++++++--
 >  1 file changed, 8 insertions(+), 2 deletions(-)

 > diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
 > index 5f90ef24d475..723a6b79cd14 100644
 > --- a/drivers/tty/serial/uartlite.c
 > +++ b/drivers/tty/serial/uartlite.c
 > @@ -418,14 +418,20 @@ static struct uart_ops ulite_ops = {
 >  #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 >  static void ulite_console_wait_tx(struct uart_port *port)
 >  {
 > -	int i;
 >  	u8 val;
 > +	unsigned long timeout;

 >  	/* Spin waiting for TX fifo to have space available */
 > -	for (i = 0; i < 100000; i++) {

It would be good to add a note about the slow jtag variant here.

Otherwise:

Acked-by: Peter Korsgaard <peter@korsgaard.com>

 > +	timeout = jiffies + msecs_to_jiffies(1000);
 > +	while (1) {
 >  		val = uart_in32(ULITE_STATUS, port);
 >  		if ((val & ULITE_STATUS_TXFULL) == 0)
 >  			break;
 > +		if (time_after(jiffies, timeout)) {
 > +			dev_warn(port->dev,
 > +				 "timeout waiting for TX buffer empty\n");
 > +			break;
 > +		}
 >  		cpu_relax();
 >  	}
 >  }
 > --
 > 1.8.2.3


-- 
Bye, Peter Korsgaard

Re: [PATCH] tty: serial: uartlite: Specify time for sending chars

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1871 bytes --]

On 05/05/2014 05:03 PM, Peter Korsgaard wrote:
>>>>>> "Michal" == Michal Simek <michal.simek@xilinx.com> writes:
> 
>  > Xilinx MDM (Microblaze Debug Module) also contains
>  > uart interface via JTAG which is compatible with
>  > uartlite driver. This interface is really slow
>  > that's why timeout is setup to 1s.
> 
>  > Make this time delay not to be cpu speed dependent.
> 
>  > Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>  > ---
> 
>  > RFC sent here:
>  > https://lkml.org/lkml/2013/9/30/250
>  > I finally got HW design which is just slow to be able
>  > to test it.
> 
>  > ---
>  >  drivers/tty/serial/uartlite.c | 10 ++++++++--
>  >  1 file changed, 8 insertions(+), 2 deletions(-)
> 
>  > diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
>  > index 5f90ef24d475..723a6b79cd14 100644
>  > --- a/drivers/tty/serial/uartlite.c
>  > +++ b/drivers/tty/serial/uartlite.c
>  > @@ -418,14 +418,20 @@ static struct uart_ops ulite_ops = {
>  >  #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
>  >  static void ulite_console_wait_tx(struct uart_port *port)
>  >  {
>  > -	int i;
>  >  	u8 val;
>  > +	unsigned long timeout;
> 
>  >  	/* Spin waiting for TX fifo to have space available */
>  > -	for (i = 0; i < 100000; i++) {
> 
> It would be good to add a note about the slow jtag variant here.

What exactly you would like to see here?
Just that this 1s is here because of mdm uart.

You can find out commit ID via git blame and description
is in commit message.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

Re: [PATCH] tty: serial: uartlite: Specify time for sending chars

[Peter Korsgaard]

>>>>> "Michal" == Michal Simek <monstr@monstr.eu> writes:

Hi,

 >> > diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
 >> > index 5f90ef24d475..723a6b79cd14 100644
 >> > --- a/drivers/tty/serial/uartlite.c
 >> > +++ b/drivers/tty/serial/uartlite.c
 >> > @@ -418,14 +418,20 @@ static struct uart_ops ulite_ops = {
 >> >  #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 >> >  static void ulite_console_wait_tx(struct uart_port *port)
 >> >  {
 >> > -	int i;
 >> >  	u8 val;
 >> > +	unsigned long timeout;
 >> 
 >> >  	/* Spin waiting for TX fifo to have space available */
 >> > -	for (i = 0; i < 100000; i++) {
 >> 
 >> It would be good to add a note about the slow jtag variant here.

 > What exactly you would like to see here?
 > Just that this 1s is here because of mdm uart.

Something like:

 /*
  * Spin waiting for TX fifo to have space available.
  * When using the Microblaze Debug Module this can take up to 1s
  */

-- 
Bye, Peter Korsgaard

Re: [PATCH] tty: serial: uartlite: Specify time for sending chars

[Michal Simek]

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

On 05/05/2014 09:42 PM, Peter Korsgaard wrote:
>>>>>> "Michal" == Michal Simek <monstr@monstr.eu> writes:
> 
> Hi,
> 
>  >> > diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
>  >> > index 5f90ef24d475..723a6b79cd14 100644
>  >> > --- a/drivers/tty/serial/uartlite.c
>  >> > +++ b/drivers/tty/serial/uartlite.c
>  >> > @@ -418,14 +418,20 @@ static struct uart_ops ulite_ops = {
>  >> >  #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
>  >> >  static void ulite_console_wait_tx(struct uart_port *port)
>  >> >  {
>  >> > -	int i;
>  >> >  	u8 val;
>  >> > +	unsigned long timeout;
>  >> 
>  >> >  	/* Spin waiting for TX fifo to have space available */
>  >> > -	for (i = 0; i < 100000; i++) {
>  >> 
>  >> It would be good to add a note about the slow jtag variant here.
> 
>  > What exactly you would like to see here?
>  > Just that this 1s is here because of mdm uart.
> 
> Something like:
> 
>  /*
>   * Spin waiting for TX fifo to have space available.
>   * When using the Microblaze Debug Module this can take up to 1s
>   */

up to you. You are driver owner. :-)
I have sent v2 with this change and I have added your ACK.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]