tty: Use the generic RS485 ioctl on CRIS

Use the new general RS485 Linux data structure (introduced by Alan with commit number c26c56c0f40e200e61d1390629c806f6adaffbcc) in the Cris architecture too (currently, Cris still uses the old private data structure instead of the new one). Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Tested-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si> Tested-by: Janez Cufer <janez.cufer@cetrtapot.si> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

tty: Use the generic RS485 ioctl on CRIS
Use the new general RS485 Linux data structure (introduced by Alan with commit number c26c56c0f40e200e61d1390629c806f6adaffbcc) in the Cris architecture too (currently, Cris still uses the old private data structure instead of the new one). Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Tested-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si> Tested-by: Janez Cufer <janez.cufer@cetrtapot.si> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Claudio Scordino · Linus Torvalds
1 parent f786ddd285
Showing 5 changed files with 66 additions and 29 deletions Side-by-side Diff
arch/cris/include/asm/ioctls.h
arch/cris/include/asm/rs485.h
arch/cris/include/asm/termios.h
drivers/serial/crisv10.c
drivers/serial/crisv10.h
@@ -74,8 +74,9 @@
 #define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
 #define FIOQSIZE	0x5460
  
-#define TIOCSERSETRS485 0x5461  /* enable rs-485 */
-#define TIOCSERWRRS485  0x5462  /* write rs-485 */
+#define TIOCSERSETRS485	0x5461  /* enable rs-485 (deprecated) */
+#define TIOCSERWRRS485	0x5462  /* write rs-485 */
+#define TIOCSRS485	0x5463  /* enable rs-485 */
  
 /* Used for packet mode */
 #define TIOCPKT_DATA		 0
 /* RS-485 structures */
  
-/* RS-485 support */
-/* Used with ioctl() TIOCSERSETRS485 */
+/* Used with ioctl() TIOCSERSETRS485 for backward compatibility!
+ * XXX: Do not use it for new code!
+ */
 struct rs485_control {
         unsigned short rts_on_send;
         unsigned short rts_after_sent;
         unsigned long delay_rts_before_send;
         unsigned short enabled;
-#ifdef __KERNEL__
-        int disable_serial_loopback;
-#endif
 };
  
 /* Used with ioctl() TIOCSERWRRS485 */
@@ -4,6 +4,7 @@
 #include <asm/termbits.h>
 #include <asm/ioctls.h>
 #include <asm/rs485.h>
+#include <linux/serial.h>
  
 struct winsize {
 	unsigned short ws_row;
@@ -1391,7 +1391,7 @@
 #if defined(CONFIG_ETRAX_RS485)
 /* Enable RS-485 mode on selected port. This is UGLY. */
 static int
-e100_enable_rs485(struct tty_struct *tty,struct rs485_control *r)
+e100_enable_rs485(struct tty_struct *tty, struct serial_rs485 *r)
 {
 	struct e100_serial * info = (struct e100_serial *)tty->driver_data;
  
  
@@ -1409,13 +1409,11 @@
 		       CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
 #endif
  
-	info->rs485.rts_on_send = 0x01 & r->rts_on_send;
-	info->rs485.rts_after_sent = 0x01 & r->rts_after_sent;
+	info->rs485.flags = r->flags;
 	if (r->delay_rts_before_send >= 1000)
 		info->rs485.delay_rts_before_send = 1000;
 	else
 		info->rs485.delay_rts_before_send = r->delay_rts_before_send;
-	info->rs485.enabled = r->enabled;
 /*	printk("rts: on send = %i, after = %i, enabled = %i",
 		    info->rs485.rts_on_send,
 		    info->rs485.rts_after_sent,
  
  
  
@@ -1430,17 +1428,18 @@
                  const unsigned char *buf, int count)
 {
 	struct e100_serial * info = (struct e100_serial *)tty->driver_data;
-	int old_enabled = info->rs485.enabled;
+	int old_value = (info->rs485.flags) & SER_RS485_ENABLED;
  
 	/* rs485 is always implicitly enabled if we're using the ioctl()
-	 * but it doesn't have to be set in the rs485_control
+	 * but it doesn't have to be set in the serial_rs485
 	 * (to be backward compatible with old apps)
 	 * So we store, set and restore it.
 	 */
-	info->rs485.enabled = 1;
+	info->rs485.flags |= SER_RS485_ENABLED;
 	/* rs_write now deals with RS485 if enabled */
 	count = rs_write(tty, buf, count);
-	info->rs485.enabled = old_enabled;
+	if (!old_value)
+		info->rs485.flags &= ~(SER_RS485_ENABLED);
 	return count;
 }
  
@@ -1451,7 +1450,7 @@
 	struct e100_serial *info = (struct e100_serial *)data;
  
 	fast_timers_rs485[info->line].function = NULL;
-	e100_rts(info, info->rs485.rts_after_sent);
+	e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND));
 #if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
 	e100_enable_rx(info);
 	e100_enable_rx_irq(info);
@@ -1647,7 +1646,7 @@
 		info->tr_running = 0;
  
 #if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
-		if (info->rs485.enabled) {
+		if (info->rs485.flags & SER_RS485_ENABLED) {
 			/* Set a short timer to toggle RTS */
 			start_one_shot_timer(&fast_timers_rs485[info->line],
 			                     rs485_toggle_rts_timer_function,
@@ -2577,7 +2576,7 @@
 	info->icount.tx++;
 	if (info->xmit.head == info->xmit.tail) {
 #if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
-		if (info->rs485.enabled) {
+		if (info->rs485.flags & SER_RS485_ENABLED) {
 			/* Set a short timer to toggle RTS */
 			start_one_shot_timer(&fast_timers_rs485[info->line],
 			                     rs485_toggle_rts_timer_function,
@@ -3218,7 +3217,7 @@
 #if defined(CONFIG_ETRAX_RS485)
 	struct e100_serial *info = (struct e100_serial *)tty->driver_data;
  
-	if (info->rs485.enabled)
+	if (info->rs485.flags & SER_RS485_ENABLED)
 	{
 		/* If we are in RS-485 mode, we need to toggle RTS and disable
 		 * the receiver before initiating a DMA transfer
@@ -3228,7 +3227,7 @@
 		fast_timers_rs485[info->line].function = NULL;
 		del_fast_timer(&fast_timers_rs485[info->line]);
 #endif
-		e100_rts(info, info->rs485.rts_on_send);
+		e100_rts(info, (info->rs485.flags & SER_RS485_RTS_ON_SEND));
 #if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
 		e100_disable_rx(info);
 		e100_enable_rx_irq(info);
@@ -3242,7 +3241,7 @@
 	count = rs_raw_write(tty, buf, count);
  
 #if defined(CONFIG_ETRAX_RS485)
-	if (info->rs485.enabled)
+	if (info->rs485.flags & SER_RS485_ENABLED)
 	{
 		unsigned int val;
 		/* If we are in RS-485 mode the following has to be done:
@@ -3263,7 +3262,7 @@
 			get_lsr_info(info, &val);
 		}while (!(val & TIOCSER_TEMT));
  
-		e100_rts(info, info->rs485.rts_after_sent);
+		e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND));
  
 #if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
 		e100_enable_rx(info);
  
  
  
@@ -3678,14 +3677,52 @@
 #if defined(CONFIG_ETRAX_RS485)
 	case TIOCSERSETRS485:
 	{
+		/* In this ioctl we still use the old structure
+		 * rs485_control for backward compatibility
+		 * (if we use serial_rs485, then old user-level code
+		 * wouldn't work anymore...).
+		 * The use of this ioctl is deprecated: use TIOCSRS485
+		 * instead.*/
 		struct rs485_control rs485ctrl;
+		struct serial_rs485 rs485data;
+		printk(KERN_DEBUG "The use of this ioctl is deprecated. Use TIOCSRS485 instead\n");
 		if (copy_from_user(&rs485ctrl, (struct rs485_control *)arg,
 				sizeof(rs485ctrl)))
 			return -EFAULT;
  
-		return e100_enable_rs485(tty, &rs485ctrl);
+		rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
+		rs485data.flags = 0;
+		if (rs485ctrl.enabled)
+			rs485data.flags |= SER_RS485_ENABLED;
+		else
+			rs485data.flags &= ~(SER_RS485_ENABLED);
+
+		if (rs485ctrl.rts_on_send)
+			rs485data.flags |= SER_RS485_RTS_ON_SEND;
+		else
+			rs485data.flags &= ~(SER_RS485_RTS_ON_SEND);
+
+		if (rs485ctrl.rts_after_sent)
+			rs485data.flags |= SER_RS485_RTS_AFTER_SEND;
+		else
+			rs485data.flags &= ~(SER_RS485_RTS_AFTER_SEND);
+
+		return e100_enable_rs485(tty, &rs485data);
 	}
  
+	case TIOCSRS485:
+	{
+		/* This is the new version of TIOCSRS485, with new
+		 * data structure serial_rs485 */
+		struct serial_rs485 rs485data;
+		if (copy_from_user(&rs485data, (struct rs485_control *)arg,
+				sizeof(rs485data)))
+			return -EFAULT;
+
+		return e100_enable_rs485(tty, &rs485data);
+	}
+
+
 	case TIOCSERWRRS485:
 	{
 		struct rs485_write rs485wr;
@@ -3827,8 +3864,8 @@
 	/* port closed */
  
 #if defined(CONFIG_ETRAX_RS485)
-	if (info->rs485.enabled) {
-		info->rs485.enabled = 0;
+	if (info->rs485.flags & SER_RS485_ENABLED) {
+		info->rs485.flags &= ~(SER_RS485_ENABLED);
 #if defined(CONFIG_ETRAX_RS485_ON_PA)
 		*R_PORT_PA_DATA = port_pa_data_shadow &= ~(1 << rs485_pa_bit);
 #endif
  
@@ -4493,10 +4530,10 @@
  
 #if defined(CONFIG_ETRAX_RS485)
 		/* Set sane defaults */
-		info->rs485.rts_on_send = 0;
-		info->rs485.rts_after_sent = 1;
+		info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
+		info->rs485.flags |= SER_RS485_RTS_AFTER_SEND;
 		info->rs485.delay_rts_before_send = 0;
-		info->rs485.enabled = 0;
+		info->rs485.flags &= ~(SER_RS485_ENABLED);
 #endif
 		INIT_WORK(&info->work, do_softint);
  
@@ -125,7 +125,7 @@
 	int errorcode;
  
 #ifdef CONFIG_ETRAX_RS485
-	struct rs485_control	rs485;  /* RS-485 support */
+	struct serial_rs485	rs485;  /* RS-485 support */
 #endif
 };
...	...	@@ -74,8 +74,9 @@
74	74	#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
75	75	#define FIOQSIZE 0x5460
76	76
77		-#define TIOCSERSETRS485 0x5461 /* enable rs-485 */
78		-#define TIOCSERWRRS485 0x5462 /* write rs-485 */
	77	+#define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */
	78	+#define TIOCSERWRRS485 0x5462 /* write rs-485 */
	79	+#define TIOCSRS485 0x5463 /* enable rs-485 */
79	80
80	81	/* Used for packet mode */
81	82	#define TIOCPKT_DATA 0
1	1	/* RS-485 structures */
2	2
3		-/* RS-485 support */
4		-/* Used with ioctl() TIOCSERSETRS485 */
	3	+/* Used with ioctl() TIOCSERSETRS485 for backward compatibility!
	4	+ * XXX: Do not use it for new code!
	5	+ */
5	6	struct rs485_control {
6	7	unsigned short rts_on_send;
7	8	unsigned short rts_after_sent;
8	9	unsigned long delay_rts_before_send;
9	10	unsigned short enabled;
10		-#ifdef __KERNEL__
11		- int disable_serial_loopback;
12		-#endif
13	11	};
14	12
15	13	/* Used with ioctl() TIOCSERWRRS485 */
...	...	@@ -4,6 +4,7 @@
4	4	#include <asm/termbits.h>
5	5	#include <asm/ioctls.h>
6	6	#include <asm/rs485.h>
	7	+#include <linux/serial.h>
7	8
8	9	struct winsize {
9	10	unsigned short ws_row;
...	...	@@ -1391,7 +1391,7 @@
1391	1391	#if defined(CONFIG_ETRAX_RS485)
1392	1392	/* Enable RS-485 mode on selected port. This is UGLY. */
1393	1393	static int
1394		-e100_enable_rs485(struct tty_struct tty,struct rs485_control r)
	1394	+e100_enable_rs485(struct tty_struct tty, struct serial_rs485 r)
1395	1395	{
1396	1396	struct e100_serial * info = (struct e100_serial *)tty->driver_data;
1397	1397
1398	1398
...	...	@@ -1409,13 +1409,11 @@
1409	1409	CONFIG_ETRAX_RS485_LTC1387_RXEN_PORT_G_BIT, 1);
1410	1410	#endif
1411	1411
1412		- info->rs485.rts_on_send = 0x01 & r->rts_on_send;
1413		- info->rs485.rts_after_sent = 0x01 & r->rts_after_sent;
	1412	+ info->rs485.flags = r->flags;
1414	1413	if (r->delay_rts_before_send >= 1000)
1415	1414	info->rs485.delay_rts_before_send = 1000;
1416	1415	else
1417	1416	info->rs485.delay_rts_before_send = r->delay_rts_before_send;
1418		- info->rs485.enabled = r->enabled;
1419	1417	/* printk("rts: on send = %i, after = %i, enabled = %i",
1420	1418	info->rs485.rts_on_send,
1421	1419	info->rs485.rts_after_sent,
1422	1420
1423	1421
1424	1422
...	...	@@ -1430,17 +1428,18 @@
1430	1428	const unsigned char *buf, int count)
1431	1429	{
1432	1430	struct e100_serial * info = (struct e100_serial *)tty->driver_data;
1433		- int old_enabled = info->rs485.enabled;
	1431	+ int old_value = (info->rs485.flags) & SER_RS485_ENABLED;
1434	1432
1435	1433	/* rs485 is always implicitly enabled if we're using the ioctl()
1436		- * but it doesn't have to be set in the rs485_control
	1434	+ * but it doesn't have to be set in the serial_rs485
1437	1435	* (to be backward compatible with old apps)
1438	1436	* So we store, set and restore it.
1439	1437	*/
1440		- info->rs485.enabled = 1;
	1438	+ info->rs485.flags \|= SER_RS485_ENABLED;
1441	1439	/* rs_write now deals with RS485 if enabled */
1442	1440	count = rs_write(tty, buf, count);
1443		- info->rs485.enabled = old_enabled;
	1441	+ if (!old_value)
	1442	+ info->rs485.flags &= ~(SER_RS485_ENABLED);
1444	1443	return count;
1445	1444	}
1446	1445
...	...	@@ -1451,7 +1450,7 @@
1451	1450	struct e100_serial info = (struct e100_serial )data;
1452	1451
1453	1452	fast_timers_rs485[info->line].function = NULL;
1454		- e100_rts(info, info->rs485.rts_after_sent);
	1453	+ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND));
1455	1454	#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
1456	1455	e100_enable_rx(info);
1457	1456	e100_enable_rx_irq(info);
...	...	@@ -1647,7 +1646,7 @@
1647	1646	info->tr_running = 0;
1648	1647
1649	1648	#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
1650		- if (info->rs485.enabled) {
	1649	+ if (info->rs485.flags & SER_RS485_ENABLED) {
1651	1650	/* Set a short timer to toggle RTS */
1652	1651	start_one_shot_timer(&fast_timers_rs485[info->line],
1653	1652	rs485_toggle_rts_timer_function,
...	...	@@ -2577,7 +2576,7 @@
2577	2576	info->icount.tx++;
2578	2577	if (info->xmit.head == info->xmit.tail) {
2579	2578	#if defined(CONFIG_ETRAX_RS485) && defined(CONFIG_ETRAX_FAST_TIMER)
2580		- if (info->rs485.enabled) {
	2579	+ if (info->rs485.flags & SER_RS485_ENABLED) {
2581	2580	/* Set a short timer to toggle RTS */
2582	2581	start_one_shot_timer(&fast_timers_rs485[info->line],
2583	2582	rs485_toggle_rts_timer_function,
...	...	@@ -3218,7 +3217,7 @@
3218	3217	#if defined(CONFIG_ETRAX_RS485)
3219	3218	struct e100_serial info = (struct e100_serial )tty->driver_data;
3220	3219
3221		- if (info->rs485.enabled)
	3220	+ if (info->rs485.flags & SER_RS485_ENABLED)
3222	3221	{
3223	3222	/* If we are in RS-485 mode, we need to toggle RTS and disable
3224	3223	* the receiver before initiating a DMA transfer
...	...	@@ -3228,7 +3227,7 @@
3228	3227	fast_timers_rs485[info->line].function = NULL;
3229	3228	del_fast_timer(&fast_timers_rs485[info->line]);
3230	3229	#endif
3231		- e100_rts(info, info->rs485.rts_on_send);
	3230	+ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_ON_SEND));
3232	3231	#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
3233	3232	e100_disable_rx(info);
3234	3233	e100_enable_rx_irq(info);
...	...	@@ -3242,7 +3241,7 @@
3242	3241	count = rs_raw_write(tty, buf, count);
3243	3242
3244	3243	#if defined(CONFIG_ETRAX_RS485)
3245		- if (info->rs485.enabled)
	3244	+ if (info->rs485.flags & SER_RS485_ENABLED)
3246	3245	{
3247	3246	unsigned int val;
3248	3247	/* If we are in RS-485 mode the following has to be done:
...	...	@@ -3263,7 +3262,7 @@
3263	3262	get_lsr_info(info, &val);
3264	3263	}while (!(val & TIOCSER_TEMT));
3265	3264
3266		- e100_rts(info, info->rs485.rts_after_sent);
	3265	+ e100_rts(info, (info->rs485.flags & SER_RS485_RTS_AFTER_SEND));
3267	3266
3268	3267	#if defined(CONFIG_ETRAX_RS485_DISABLE_RECEIVER)
3269	3268	e100_enable_rx(info);
3270	3269
3271	3270
3272	3271
...	...	@@ -3678,14 +3677,52 @@
3678	3677	#if defined(CONFIG_ETRAX_RS485)
3679	3678	case TIOCSERSETRS485:
3680	3679	{
	3680	+ /* In this ioctl we still use the old structure
	3681	+ * rs485_control for backward compatibility
	3682	+ * (if we use serial_rs485, then old user-level code
	3683	+ * wouldn't work anymore...).
	3684	+ * The use of this ioctl is deprecated: use TIOCSRS485
	3685	+ * instead.*/
3681	3686	struct rs485_control rs485ctrl;
	3687	+ struct serial_rs485 rs485data;
	3688	+ printk(KERN_DEBUG "The use of this ioctl is deprecated. Use TIOCSRS485 instead\n");
3682	3689	if (copy_from_user(&rs485ctrl, (struct rs485_control *)arg,
3683	3690	sizeof(rs485ctrl)))
3684	3691	return -EFAULT;
3685	3692
3686		- return e100_enable_rs485(tty, &rs485ctrl);
	3693	+ rs485data.delay_rts_before_send = rs485ctrl.delay_rts_before_send;
	3694	+ rs485data.flags = 0;
	3695	+ if (rs485ctrl.enabled)
	3696	+ rs485data.flags \|= SER_RS485_ENABLED;
	3697	+ else
	3698	+ rs485data.flags &= ~(SER_RS485_ENABLED);
	3699	+
	3700	+ if (rs485ctrl.rts_on_send)
	3701	+ rs485data.flags \|= SER_RS485_RTS_ON_SEND;
	3702	+ else
	3703	+ rs485data.flags &= ~(SER_RS485_RTS_ON_SEND);
	3704	+
	3705	+ if (rs485ctrl.rts_after_sent)
	3706	+ rs485data.flags \|= SER_RS485_RTS_AFTER_SEND;
	3707	+ else
	3708	+ rs485data.flags &= ~(SER_RS485_RTS_AFTER_SEND);
	3709	+
	3710	+ return e100_enable_rs485(tty, &rs485data);
3687	3711	}
3688	3712
	3713	+ case TIOCSRS485:
	3714	+ {
	3715	+ /* This is the new version of TIOCSRS485, with new
	3716	+ * data structure serial_rs485 */
	3717	+ struct serial_rs485 rs485data;
	3718	+ if (copy_from_user(&rs485data, (struct rs485_control *)arg,
	3719	+ sizeof(rs485data)))
	3720	+ return -EFAULT;
	3721	+
	3722	+ return e100_enable_rs485(tty, &rs485data);
	3723	+ }
	3724	+
	3725	+
3689	3726	case TIOCSERWRRS485:
3690	3727	{
3691	3728	struct rs485_write rs485wr;
...	...	@@ -3827,8 +3864,8 @@
3827	3864	/* port closed */
3828	3865
3829	3866	#if defined(CONFIG_ETRAX_RS485)
3830		- if (info->rs485.enabled) {
3831		- info->rs485.enabled = 0;
	3867	+ if (info->rs485.flags & SER_RS485_ENABLED) {
	3868	+ info->rs485.flags &= ~(SER_RS485_ENABLED);
3832	3869	#if defined(CONFIG_ETRAX_RS485_ON_PA)
3833	3870	*R_PORT_PA_DATA = port_pa_data_shadow &= ~(1 << rs485_pa_bit);
3834	3871	#endif
3835	3872
...	...	@@ -4493,10 +4530,10 @@
4493	4530
4494	4531	#if defined(CONFIG_ETRAX_RS485)
4495	4532	/* Set sane defaults */
4496		- info->rs485.rts_on_send = 0;
4497		- info->rs485.rts_after_sent = 1;
	4533	+ info->rs485.flags &= ~(SER_RS485_RTS_ON_SEND);
	4534	+ info->rs485.flags \|= SER_RS485_RTS_AFTER_SEND;
4498	4535	info->rs485.delay_rts_before_send = 0;
4499		- info->rs485.enabled = 0;
	4536	+ info->rs485.flags &= ~(SER_RS485_ENABLED);
4500	4537	#endif
4501	4538	INIT_WORK(&info->work, do_softint);
4502	4539
...	...	@@ -125,7 +125,7 @@
125	125	int errorcode;
126	126
127	127	#ifdef CONFIG_ETRAX_RS485
128		- struct rs485_control rs485; /* RS-485 support */
	128	+ struct serial_rs485 rs485; /* RS-485 support */
129	129	#endif
130	130	};
131	131