tty: mxser: use the tty_port_open method

At first this looks a fairly trivial conversion but we can't quite push everything into the right format yet. The open side is easy but care is needed over the setserial methods. Fix up the locking now that we've adopted the port->mutex locking rule for the initialization. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

tty: mxser: use the tty_port_open method
At first this looks a fairly trivial conversion but we can't quite push everything into the right format yet. The open side is easy but care is needed over the setserial methods. Fix up the locking now that we've adopted the port->mutex locking rule for the initialization. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox · Greg Kroah-Hartman
1 parent 6ed847d8ef
Showing 1 changed file with 35 additions and 76 deletions Side-by-side Diff
drivers/char/mxser.c
@@ -856,9 +856,9 @@
 	}
 }
  
-static int mxser_startup(struct tty_struct *tty)
+static int mxser_activate(struct tty_port *port, struct tty_struct *tty)
 {
-	struct mxser_port *info = tty->driver_data;
+	struct mxser_port *info = container_of(port, struct mxser_port, port);
 	unsigned long page;
 	unsigned long flags;
  
  
@@ -868,22 +868,13 @@
  
 	spin_lock_irqsave(&info->slock, flags);
  
-	if (info->port.flags & ASYNC_INITIALIZED) {
-		free_page(page);
-		spin_unlock_irqrestore(&info->slock, flags);
-		return 0;
-	}
-
 	if (!info->ioaddr || !info->type) {
 		set_bit(TTY_IO_ERROR, &tty->flags);
 		free_page(page);
 		spin_unlock_irqrestore(&info->slock, flags);
 		return 0;
 	}
-	if (info->port.xmit_buf)
-		free_page(page);
-	else
-		info->port.xmit_buf = (unsigned char *) page;
+	info->port.xmit_buf = (unsigned char *) page;
  
 	/*
 	 * Clear the FIFO buffers and disable them
  
  
  
  
@@ -951,24 +942,19 @@
 	 * and set the speed of the serial port
 	 */
 	mxser_change_speed(tty, NULL);
-	info->port.flags |= ASYNC_INITIALIZED;
 	spin_unlock_irqrestore(&info->slock, flags);
  
 	return 0;
 }
  
 /*
- * This routine will shutdown a serial port; interrupts maybe disabled, and
- * DTR is dropped if the hangup on close termio flag is on.
+ * This routine will shutdown a serial port
  */
-static void mxser_shutdown(struct tty_struct *tty)
+static void mxser_shutdown_port(struct tty_port *port)
 {
-	struct mxser_port *info = tty->driver_data;
+	struct mxser_port *info = container_of(port, struct mxser_port, port);
 	unsigned long flags;
  
-	if (!(info->port.flags & ASYNC_INITIALIZED))
-		return;
-
 	spin_lock_irqsave(&info->slock, flags);
  
 	/*
@@ -978,7 +964,7 @@
 	wake_up_interruptible(&info->port.delta_msr_wait);
  
 	/*
-	 * Free the IRQ, if necessary
+	 * Free the xmit buffer, if necessary
 	 */
 	if (info->port.xmit_buf) {
 		free_page((unsigned long) info->port.xmit_buf);
@@ -988,10 +974,6 @@
 	info->IER = 0;
 	outb(0x00, info->ioaddr + UART_IER);
  
-	if (tty->termios->c_cflag & HUPCL)
-		info->MCR &= ~(UART_MCR_DTR | UART_MCR_RTS);
-	outb(info->MCR, info->ioaddr + UART_MCR);
-
 	/* clear Rx/Tx FIFO's */
 	if (info->board->chip_flag)
 		outb(UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT |
  
@@ -1004,10 +986,7 @@
 	/* read data port to reset things */
 	(void) inb(info->ioaddr + UART_RX);
  
-	set_bit(TTY_IO_ERROR, &tty->flags);
  
-	info->port.flags &= ~ASYNC_INITIALIZED;
-
 	if (info->board->chip_flag)
 		SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info->ioaddr);
  
@@ -1023,8 +1002,7 @@
 static int mxser_open(struct tty_struct *tty, struct file *filp)
 {
 	struct mxser_port *info;
-	unsigned long flags;
-	int retval, line;
+	int line;
  
 	line = tty->index;
 	if (line == MXSER_PORTS)
@@ -1035,23 +1013,7 @@
 	if (!info->ioaddr)
 		return -ENODEV;
  
-	tty->driver_data = info;
-	tty_port_tty_set(&info->port, tty);
-	/*
-	 * Start up serial port
-	 */
-	spin_lock_irqsave(&info->port.lock, flags);
-	info->port.count++;
-	spin_unlock_irqrestore(&info->port.lock, flags);
-	retval = mxser_startup(tty);
-	if (retval)
-		return retval;
-
-	retval = tty_port_block_til_ready(&info->port, tty, filp);
-	if (retval)
-		return retval;
-
-	return 0;
+	return tty_port_open(&info->port, tty, filp);
 }
  
 static void mxser_flush_buffer(struct tty_struct *tty)
  
@@ -1075,19 +1037,11 @@
 }
  
  
-static void mxser_close_port(struct tty_struct *tty, struct tty_port *port)
+static void mxser_close_port(struct tty_port *port)
 {
 	struct mxser_port *info = container_of(port, struct mxser_port, port);
 	unsigned long timeout;
 	/*
-	 * Save the termios structure, since this port may have
-	 * separate termios for callout and dialin.
-	 *
-	 * FIXME: Can this go ?
-	 */
-	if (port->flags & ASYNC_NORMAL_ACTIVE)
-		info->normal_termios = *tty->termios;
-	/*
 	 * At this point we stop accepting input.  To do this, we
 	 * disable the receive line status interrupts, and tell the
 	 * interrupt driver to stop checking the data ready bit in the
  
@@ -1097,22 +1051,18 @@
 	if (info->board->chip_flag)
 		info->IER &= ~MOXA_MUST_RECV_ISR;
  
-	if (port->flags & ASYNC_INITIALIZED) {
-		outb(info->IER, info->ioaddr + UART_IER);
-		/*
-		 * Before we drop DTR, make sure the UART transmitter
-		 * has completely drained; this is especially
-		 * important if there is a transmit FIFO!
-		 */
-		timeout = jiffies + HZ;
-		while (!(inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT)) {
-			schedule_timeout_interruptible(5);
-			if (time_after(jiffies, timeout))
-				break;
-		}
+	outb(info->IER, info->ioaddr + UART_IER);
+	/*
+	 * Before we drop DTR, make sure the UART transmitter
+	 * has completely drained; this is especially
+	 * important if there is a transmit FIFO!
+	 */
+	timeout = jiffies + HZ;
+	while (!(inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT)) {
+		schedule_timeout_interruptible(5);
+		if (time_after(jiffies, timeout))
+			break;
 	}
-	mxser_shutdown(tty);
-
 }
  
 /*
  
@@ -1130,8 +1080,12 @@
 		return;
 	if (tty_port_close_start(port, tty, filp) == 0)
 		return;
-	mxser_close_port(tty, port);
+	mutex_lock(&port->mutex);
+	mxser_close_port(port);
 	mxser_flush_buffer(tty);
+	mxser_shutdown_port(port);
+	clear_bit(ASYNCB_INITIALIZED, &port->flags);
+	mutex_unlock(&port->mutex);
 	/* Right now the tty_port set is done outside of the close_end helper
 	   as we don't yet have everyone using refcounts */	
 	tty_port_close_end(port, tty);
@@ -1329,9 +1283,13 @@
 			mxser_change_speed(tty, NULL);
 			spin_unlock_irqrestore(&info->slock, sl_flags);
 		}
-	} else
-		retval = mxser_startup(tty);
-
+	} else {
+		mutex_lock(&info->port.mutex);
+		retval = mxser_activate(&info->port, tty);
+		if (retval == 0)
+			set_bit(ASYNCB_INITIALIZED, &info->port.flags);
+		mutex_unlock(&info->port.mutex);
+	}
 	return retval;
 }
  
@@ -2059,7 +2017,6 @@
 	struct mxser_port *info = tty->driver_data;
  
 	mxser_flush_buffer(tty);
-	mxser_shutdown(tty);
 	tty_port_hangup(&info->port);
 }
  
@@ -2363,6 +2320,8 @@
 struct tty_port_operations mxser_port_ops = {
 	.carrier_raised = mxser_carrier_raised,
 	.dtr_rts = mxser_dtr_rts,
+	.activate = mxser_activate,
+	.shutdown = mxser_shutdown_port,
 };
  
 /*
...	...	@@ -856,9 +856,9 @@
856	856	}
857	857	}
858	858
859		-static int mxser_startup(struct tty_struct *tty)
	859	+static int mxser_activate(struct tty_port port, struct tty_struct tty)
860	860	{
861		- struct mxser_port *info = tty->driver_data;
	861	+ struct mxser_port *info = container_of(port, struct mxser_port, port);
862	862	unsigned long page;
863	863	unsigned long flags;
864	864
865	865
...	...	@@ -868,22 +868,13 @@
868	868
869	869	spin_lock_irqsave(&info->slock, flags);
870	870
871		- if (info->port.flags & ASYNC_INITIALIZED) {
872		- free_page(page);
873		- spin_unlock_irqrestore(&info->slock, flags);
874		- return 0;
875		- }
876		-
877	871	if (!info->ioaddr \|\| !info->type) {
878	872	set_bit(TTY_IO_ERROR, &tty->flags);
879	873	free_page(page);
880	874	spin_unlock_irqrestore(&info->slock, flags);
881	875	return 0;
882	876	}
883		- if (info->port.xmit_buf)
884		- free_page(page);
885		- else
886		- info->port.xmit_buf = (unsigned char *) page;
	877	+ info->port.xmit_buf = (unsigned char *) page;
887	878
888	879	/*
889	880	* Clear the FIFO buffers and disable them
890	881
891	882
892	883
893	884
...	...	@@ -951,24 +942,19 @@
951	942	* and set the speed of the serial port
952	943	*/
953	944	mxser_change_speed(tty, NULL);
954		- info->port.flags \|= ASYNC_INITIALIZED;
955	945	spin_unlock_irqrestore(&info->slock, flags);
956	946
957	947	return 0;
958	948	}
959	949
960	950	/*
961		- * This routine will shutdown a serial port; interrupts maybe disabled, and
962		- * DTR is dropped if the hangup on close termio flag is on.
	951	+ * This routine will shutdown a serial port
963	952	*/
964		-static void mxser_shutdown(struct tty_struct *tty)
	953	+static void mxser_shutdown_port(struct tty_port *port)
965	954	{
966		- struct mxser_port *info = tty->driver_data;
	955	+ struct mxser_port *info = container_of(port, struct mxser_port, port);
967	956	unsigned long flags;
968	957
969		- if (!(info->port.flags & ASYNC_INITIALIZED))
970		- return;
971		-
972	958	spin_lock_irqsave(&info->slock, flags);
973	959
974	960	/*
...	...	@@ -978,7 +964,7 @@
978	964	wake_up_interruptible(&info->port.delta_msr_wait);
979	965
980	966	/*
981		- * Free the IRQ, if necessary
	967	+ * Free the xmit buffer, if necessary
982	968	*/
983	969	if (info->port.xmit_buf) {
984	970	free_page((unsigned long) info->port.xmit_buf);
...	...	@@ -988,10 +974,6 @@
988	974	info->IER = 0;
989	975	outb(0x00, info->ioaddr + UART_IER);
990	976
991		- if (tty->termios->c_cflag & HUPCL)
992		- info->MCR &= ~(UART_MCR_DTR \| UART_MCR_RTS);
993		- outb(info->MCR, info->ioaddr + UART_MCR);
994		-
995	977	/* clear Rx/Tx FIFO's */
996	978	if (info->board->chip_flag)
997	979	outb(UART_FCR_CLEAR_RCVR \| UART_FCR_CLEAR_XMIT \|
998	980
...	...	@@ -1004,10 +986,7 @@
1004	986	/* read data port to reset things */
1005	987	(void) inb(info->ioaddr + UART_RX);
1006	988
1007		- set_bit(TTY_IO_ERROR, &tty->flags);
1008	989
1009		- info->port.flags &= ~ASYNC_INITIALIZED;
1010		-
1011	990	if (info->board->chip_flag)
1012	991	SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info->ioaddr);
1013	992
...	...	@@ -1023,8 +1002,7 @@
1023	1002	static int mxser_open(struct tty_struct tty, struct file filp)
1024	1003	{
1025	1004	struct mxser_port *info;
1026		- unsigned long flags;
1027		- int retval, line;
	1005	+ int line;
1028	1006
1029	1007	line = tty->index;
1030	1008	if (line == MXSER_PORTS)
...	...	@@ -1035,23 +1013,7 @@
1035	1013	if (!info->ioaddr)
1036	1014	return -ENODEV;
1037	1015
1038		- tty->driver_data = info;
1039		- tty_port_tty_set(&info->port, tty);
1040		- /*
1041		- * Start up serial port
1042		- */
1043		- spin_lock_irqsave(&info->port.lock, flags);
1044		- info->port.count++;
1045		- spin_unlock_irqrestore(&info->port.lock, flags);
1046		- retval = mxser_startup(tty);
1047		- if (retval)
1048		- return retval;
1049		-
1050		- retval = tty_port_block_til_ready(&info->port, tty, filp);
1051		- if (retval)
1052		- return retval;
1053		-
1054		- return 0;
	1016	+ return tty_port_open(&info->port, tty, filp);
1055	1017	}
1056	1018
1057	1019	static void mxser_flush_buffer(struct tty_struct *tty)
1058	1020
...	...	@@ -1075,19 +1037,11 @@
1075	1037	}
1076	1038
1077	1039
1078		-static void mxser_close_port(struct tty_struct tty, struct tty_port port)
	1040	+static void mxser_close_port(struct tty_port *port)
1079	1041	{
1080	1042	struct mxser_port *info = container_of(port, struct mxser_port, port);
1081	1043	unsigned long timeout;
1082	1044	/*
1083		- * Save the termios structure, since this port may have
1084		- * separate termios for callout and dialin.
1085		- *
1086		- * FIXME: Can this go ?
1087		- */
1088		- if (port->flags & ASYNC_NORMAL_ACTIVE)
1089		- info->normal_termios = *tty->termios;
1090		- /*
1091	1045	* At this point we stop accepting input. To do this, we
1092	1046	* disable the receive line status interrupts, and tell the
1093	1047	* interrupt driver to stop checking the data ready bit in the
1094	1048
...	...	@@ -1097,22 +1051,18 @@
1097	1051	if (info->board->chip_flag)
1098	1052	info->IER &= ~MOXA_MUST_RECV_ISR;
1099	1053
1100		- if (port->flags & ASYNC_INITIALIZED) {
1101		- outb(info->IER, info->ioaddr + UART_IER);
1102		- /*
1103		- * Before we drop DTR, make sure the UART transmitter
1104		- * has completely drained; this is especially
1105		- * important if there is a transmit FIFO!
1106		- */
1107		- timeout = jiffies + HZ;
1108		- while (!(inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT)) {
1109		- schedule_timeout_interruptible(5);
1110		- if (time_after(jiffies, timeout))
1111		- break;
1112		- }
	1054	+ outb(info->IER, info->ioaddr + UART_IER);
	1055	+ /*
	1056	+ * Before we drop DTR, make sure the UART transmitter
	1057	+ * has completely drained; this is especially
	1058	+ * important if there is a transmit FIFO!
	1059	+ */
	1060	+ timeout = jiffies + HZ;
	1061	+ while (!(inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT)) {
	1062	+ schedule_timeout_interruptible(5);
	1063	+ if (time_after(jiffies, timeout))
	1064	+ break;
1113	1065	}
1114		- mxser_shutdown(tty);
1115		-
1116	1066	}
1117	1067
1118	1068	/*
1119	1069
...	...	@@ -1130,8 +1080,12 @@
1130	1080	return;
1131	1081	if (tty_port_close_start(port, tty, filp) == 0)
1132	1082	return;
1133		- mxser_close_port(tty, port);
	1083	+ mutex_lock(&port->mutex);
	1084	+ mxser_close_port(port);
1134	1085	mxser_flush_buffer(tty);
	1086	+ mxser_shutdown_port(port);
	1087	+ clear_bit(ASYNCB_INITIALIZED, &port->flags);
	1088	+ mutex_unlock(&port->mutex);
1135	1089	/* Right now the tty_port set is done outside of the close_end helper
1136	1090	as we don't yet have everyone using refcounts */
1137	1091	tty_port_close_end(port, tty);
...	...	@@ -1329,9 +1283,13 @@
1329	1283	mxser_change_speed(tty, NULL);
1330	1284	spin_unlock_irqrestore(&info->slock, sl_flags);
1331	1285	}
1332		- } else
1333		- retval = mxser_startup(tty);
1334		-
	1286	+ } else {
	1287	+ mutex_lock(&info->port.mutex);
	1288	+ retval = mxser_activate(&info->port, tty);
	1289	+ if (retval == 0)
	1290	+ set_bit(ASYNCB_INITIALIZED, &info->port.flags);
	1291	+ mutex_unlock(&info->port.mutex);
	1292	+ }
1335	1293	return retval;
1336	1294	}
1337	1295
...	...	@@ -2059,7 +2017,6 @@
2059	2017	struct mxser_port *info = tty->driver_data;
2060	2018
2061	2019	mxser_flush_buffer(tty);
2062		- mxser_shutdown(tty);
2063	2020	tty_port_hangup(&info->port);
2064	2021	}
2065	2022
...	...	@@ -2363,6 +2320,8 @@
2363	2320	struct tty_port_operations mxser_port_ops = {
2364	2321	.carrier_raised = mxser_carrier_raised,
2365	2322	.dtr_rts = mxser_dtr_rts,
	2323	+ .activate = mxser_activate,
	2324	+ .shutdown = mxser_shutdown_port,
2366	2325	};
2367	2326
2368	2327	/*