CRIS RS485: Check SER_RS485_RTS_BEFORE_SEND before delaying.

PATCH In review Claudio Scordino 2 participants 4 messages Aug 11, 2010 – Oct 19, 2010 TTY layer and serial drivers

lore

Share & tools

lore

Claudio Scordino

author

2010-08-11 15:09 UTC #0 lore raw

PATCH 1/1 CRIS RS485: Check SER_RS485_RTS_BEFORE_SEND before delaying.

Hi Jesper,

the following patch fixes the usage of the delay in RS485 mode
on the Cris architecture.

Very recently, the RS485 interface has been fixed by adding two further fields (see commit 1b6331848b69d1ed165a6bdc75c4046d68767563).

This patch checks the value of the flag SER_RS485_RTS_BEFORE_SEND before delaying.

Best regards,

Claudio

CRIS RS485: Check SER_RS485_RTS_BEFORE_SEND before delaying.

Signed-off-by Claudio Scordino <[email protected]>

---
 drivers/serial/crisv10.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

drivers/serial/crisv10.c +14 -7

index c856905..a2237e7 100644
@@ -1411,11 +1411,12 @@ e100_enable_rs485(struct tty_struct *tty, struct serial_rs485 *r)
 		       CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
 #endif
 
-	info->rs485.flags = r->flags;
-	if (r->delay_rts_before_send >= 1000)
+	info->rs485 = *r;
+
+	/* Maximum delay before RTS equal to 1000 */
+	if (info->rs485.delay_rts_before_send >= 1000)
 		info->rs485.delay_rts_before_send = 1000;
-	else
-		info->rs485.delay_rts_before_send = r->delay_rts_before_send;
+
 /*	printk("rts: on send = %i, after = %i, enabled = %i",
 		    info->rs485.rts_on_send,
 		    info->rs485.rts_after_sent,

@@ -3234,9 +3235,9 @@ rs_write(struct tty_struct *tty,
 		e100_disable_rx(info);
 		e100_enable_rx_irq(info);
 #endif
-
-		if (info->rs485.delay_rts_before_send > 0)
-			msleep(info->rs485.delay_rts_before_send);
+		if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) &&
+			(info->rs485.delay_rts_before_send > 0))
+				msleep(info->rs485.delay_rts_before_send);
 	}
 #endif /* CONFIG_ETRAX_RS485 */

@@ -3694,6 +3695,11 @@ rs_ioctl(struct tty_struct *tty, struct file * file,
 
 		rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
 		rs485data.flags = 0;
+		if (rs485data.delay_rts_before_send != 0)
+			rs485data.flags |= SER_RS485_RTS_BEFORE_SEND;
+		else
+			rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
+
 		if (rs485ctrl.enabled)
 			rs485data.flags |= SER_RS485_ENABLED;
 		else

@@ -4527,6 +4533,7 @@ static int __init rs_init(void)
 		/* Set sane defaults */
 		info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
 		info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
+		info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
 		info->rs485.delay_rts_before_send = 0;
 		info->rs485.flags &= ~(SER_RS485_ENABLED);
 #endif

Signature · 1 line

1.6.0.4

Claudio Scordino

author

2010-08-30 08:32 UTC #1 lore raw

Claudio Scordino ha scritto:

Quoted 10 lines

Hi Jesper,
the following patch fixes the usage of the delay in RS485 mode
on the Cris architecture.
Very recently, the RS485 interface has been fixed by adding two further fields (see commit 1b6331848b69d1ed165a6bdc75c4046d68767563).
This patch checks the value of the flag SER_RS485_RTS_BEFORE_SEND before delaying.

Hi all,

so far I didn't receive any acknowledgement about this patch.

As I said, recently (see commit 1b6331848b69d1ed165a6bdc75c4046d68767563) the Linux RS485 interface has been fixed by adding two missing fields.

With the "new" interface, you have to check the SER_RS485_RTS_BEFORE_SEND flag before using the delay_rts_before_send field.

The Atmel serial driver has been already fixed (with commit 1b6331848b69d1ed165a6bdc75c4046d68767563 itself).

This patch fixes the usage of the interface in the Cris driver too.

Best regards,

Claudio

Mikael Starvik

Acked-by

2010-08-30 08:40 UTC #2 lore raw

Hi!

Jesper is on vacation but I find this patch ok.

Acked-by Mikael Starvik<[email protected]>

/Mikael

-----Original Message-----
From: Claudio Scordino [mailto:[email protected]]
Sent: den 30 augusti 2010 10:32
To: Jesper Nilsson
Cc: Mikael Starvik; linux-cris-kernel; Alan Cox; Andrew Morton; Hinko Kocevar; Janez Cufer; Andy Whitcroft; Linux Kernel; dev-etrax; [email protected]
Subject: Re: [PATCH] CRIS RS485: Check SER_RS485_RTS_BEFORE_SEND before delaying.

Claudio Scordino ha scritto:

Quoted 10 lines

Hi Jesper,
the following patch fixes the usage of the delay in RS485 mode
on the Cris architecture.
Very recently, the RS485 interface has been fixed by adding two further fields (see commit 1b6331848b69d1ed165a6bdc75c4046d68767563).
This patch checks the value of the flag SER_RS485_RTS_BEFORE_SEND before delaying.

Hi all,

so far I didn't receive any acknowledgement about this patch.

As I said, recently (see commit 1b6331848b69d1ed165a6bdc75c4046d68767563) the Linux RS485 interface has been fixed by adding two missing fields.

With the "new" interface, you have to check the SER_RS485_RTS_BEFORE_SEND flag before using the delay_rts_before_send field.

The Atmel serial driver has been already fixed (with commit 1b6331848b69d1ed165a6bdc75c4046d68767563 itself).

This patch fixes the usage of the interface in the Cris driver too.

Best regards,

Claudio

Claudio Scordino

author Acked-by Mikael Starvik

2010-10-19 12:34 UTC #3 lore raw

Mikael Starvik ha scritto:

Quoted 5 lines

Hi!
Jesper is on vacation but I find this patch ok.
Acked-by Mikael Starvik<[email protected]>

Hi Mikael, Hi Jesper,

the merge window will be opened very soon. So, please remember
this patch.

I already fixed the atmel_serial driver (commit number 1b6331848b69d1ed165a6bdc75c4046d68767563)

Now, it's quite important to fix the Cris driver as well.

Cheers,

Claudio

CRIS RS485: Check SER_RS485_RTS_BEFORE_SEND before delaying.

Signed-off-by Claudio Scordino <[email protected]>

Acked-by Mikael Starvik <[email protected]>

---
 drivers/serial/crisv10.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

drivers/serial/crisv10.c +14 -7

index c856905..a2237e7 100644
@@ -1411,11 +1411,12 @@ e100_enable_rs485(struct tty_struct *tty, struct serial_rs485 *r)
 		       CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
 #endif
 
-	info->rs485.flags = r->flags;
-	if (r->delay_rts_before_send >= 1000)
+	info->rs485 = *r;
+
+	/* Maximum delay before RTS equal to 1000 */
+	if (info->rs485.delay_rts_before_send >= 1000)
 		info->rs485.delay_rts_before_send = 1000;
-	else
-		info->rs485.delay_rts_before_send = r->delay_rts_before_send;
+
 /*	printk("rts: on send = %i, after = %i, enabled = %i",
 		    info->rs485.rts_on_send,
 		    info->rs485.rts_after_sent,

@@ -3234,9 +3235,9 @@ rs_write(struct tty_struct *tty,
 		e100_disable_rx(info);
 		e100_enable_rx_irq(info);
 #endif
-
-		if (info->rs485.delay_rts_before_send > 0)
-			msleep(info->rs485.delay_rts_before_send);
+		if ((info->rs485.flags & SER_RS485_RTS_BEFORE_SEND) &&
+			(info->rs485.delay_rts_before_send > 0))
+				msleep(info->rs485.delay_rts_before_send);
 	}
 #endif /* CONFIG_ETRAX_RS485 */

@@ -3694,6 +3695,11 @@ rs_ioctl(struct tty_struct *tty, struct file * file,
 
 		rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
 		rs485data.flags = 0;
+		if (rs485data.delay_rts_before_send != 0)
+			rs485data.flags |= SER_RS485_RTS_BEFORE_SEND;
+		else
+			rs485data.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
+
 		if (rs485ctrl.enabled)
 			rs485data.flags |= SER_RS485_ENABLED;
 		else

@@ -4527,6 +4533,7 @@ static int __init rs_init(void)
 		/* Set sane defaults */
 		info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
 		info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
+		info->rs485.flags &= ~(SER_RS485_RTS_BEFORE_SEND);
 		info->rs485.delay_rts_before_send = 0;
 		info->rs485.flags &= ~(SER_RS485_ENABLED);
 #endif