Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d951fb4 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty: Pull the dtr raise into tty port 



This moves another per device special out of what should be shared open
wait paths into private methods

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d0c9873a

drivers/char/isicom.c

+8 −5
Original line number Diff line number Diff line
@@ -328,11 +328,13 @@ static inline void drop_rts(struct isi_port *port) 
}



/* card->lock MUST NOT be held */

static inline void raise_dtr_rts(struct isi_port *port)



static void isicom_raise_dtr_rts(struct tty_port *port)

{

	struct isi_board *card = port->card;

	struct isi_port *ip = container_of(port, struct isi_port, port);

	struct isi_board *card = ip->card;

	unsigned long base = card->base;

	u16 channel = port->channel;

	u16 channel = ip->channel;



	if (!lock_card(card))

		return;
@@ -340,7 +342,7 @@ static inline void raise_dtr_rts(struct isi_port *port) 
	outw(0x8000 | (channel << card->shift_count) | 0x02, base);

	outw(0x0f04, base);

	InterruptTheCard(base);

	port->status |= (ISI_DTR | ISI_RTS);

	ip->status |= (ISI_DTR | ISI_RTS);

	unlock_card(card);

}
@@ -881,7 +883,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, 
	spin_unlock_irqrestore(&card->card_lock, flags);



	while (1) {

		raise_dtr_rts(ip);

		tty_port_raise_dtr_rts(port);



		set_current_state(TASK_INTERRUPTIBLE);

		if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {
@@ -1462,6 +1464,7 @@ static const struct tty_operations isicom_ops = { 


static const struct tty_port_operations isicom_port_ops = {

	.carrier_raised		= isicom_carrier_raised,

	.raise_dtr_rts		= isicom_raise_dtr_rts,

};



static int __devinit reset_card(struct pci_dev *pdev,

drivers/char/mxser.c

+13 −4
Original line number Diff line number Diff line
@@ -547,6 +547,17 @@ static int mxser_carrier_raised(struct tty_port *port) 
	return (inb(mp->ioaddr + UART_MSR) & UART_MSR_DCD)?1:0;

}



static void mxser_raise_dtr_rts(struct tty_port *port)

{

	struct mxser_port *mp = container_of(port, struct mxser_port, port);

	unsigned long flags;



	spin_lock_irqsave(&mp->slock, flags);

	outb(inb(mp->ioaddr + UART_MCR) |

		UART_MCR_DTR | UART_MCR_RTS, mp->ioaddr + UART_MCR);

	spin_unlock_irqrestore(&mp->slock, flags);

}



static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,

		struct mxser_port *mp)

{
@@ -586,10 +597,7 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp, 
	spin_unlock_irqrestore(&mp->slock, flags);

	port->blocked_open++;

	while (1) {

		spin_lock_irqsave(&mp->slock, flags);

		outb(inb(mp->ioaddr + UART_MCR) |

			UART_MCR_DTR | UART_MCR_RTS, mp->ioaddr + UART_MCR);

		spin_unlock_irqrestore(&mp->slock, flags);

		tty_port_raise_dtr_rts(port);

		set_current_state(TASK_INTERRUPTIBLE);

		if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {

			if (port->flags & ASYNC_HUP_NOTIFY)
@@ -2458,6 +2466,7 @@ static const struct tty_operations mxser_ops = { 


struct tty_port_operations mxser_port_ops = {

	.carrier_raised = mxser_carrier_raised,

	.raise_dtr_rts = mxser_raise_dtr_rts,

};



/*

drivers/char/rocket.c

+10 −4
Original line number Diff line number Diff line
@@ -870,6 +870,13 @@ static int carrier_raised(struct tty_port *port) 
	return (sGetChanStatusLo(&info->channel) & CD_ACT) ? 1 : 0;

}



static void raise_dtr_rts(struct tty_port *port)

{

	struct r_port *info = container_of(port, struct r_port, port);

	sSetDTR(&info->channel);

	sSetRTS(&info->channel);

}



/*  info->port.count is considered critical, protected by spinlocks.  */

static int block_til_ready(struct tty_struct *tty, struct file *filp,

			   struct r_port *info)
@@ -928,10 +935,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, 
	spin_unlock_irqrestore(&info->slock, flags);



	while (1) {

		if (tty->termios->c_cflag & CBAUD) {

			sSetDTR(&info->channel);

			sSetRTS(&info->channel);

		}

		if (tty->termios->c_cflag & CBAUD)

			tty_port_raise_dtr_rts(port);

		set_current_state(TASK_INTERRUPTIBLE);

		if (tty_hung_up_p(filp) || !(info->flags & ROCKET_INITIALIZED)) {

			if (info->flags & ROCKET_HUP_NOTIFY)
@@ -2381,6 +2386,7 @@ static const struct tty_operations rocket_ops = { 


static const struct tty_port_operations rocket_port_ops = {

	.carrier_raised = carrier_raised,

	.raise_dtr_rts = raise_dtr_rts,

};



/*

drivers/char/synclink.c

+15 −6
Original line number Diff line number Diff line
@@ -3298,6 +3298,18 @@ static int carrier_raised(struct tty_port *port) 
	return (info->serial_signals & SerialSignal_DCD) ? 1 : 0;

}



static void raise_dtr_rts(struct tty_port *port)

{

	struct mgsl_struct *info = container_of(port, struct mgsl_struct, port);

	unsigned long flags;



	spin_lock_irqsave(&info->irq_spinlock,flags);

	info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;

 	usc_set_serial_signals(info);

	spin_unlock_irqrestore(&info->irq_spinlock,flags);

}





/* block_til_ready()

 * 

 * 	Block the current process until the specified port
@@ -3358,12 +3370,8 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, 
	port->blocked_open++;

	

	while (1) {

		if (tty->termios->c_cflag & CBAUD) {

			spin_lock_irqsave(&info->irq_spinlock,flags);

			info->serial_signals |= SerialSignal_RTS + SerialSignal_DTR;

		 	usc_set_serial_signals(info);

			spin_unlock_irqrestore(&info->irq_spinlock,flags);

		}

		if (tty->termios->c_cflag & CBAUD)

			tty_port_raise_dtr_rts(port);

		

		set_current_state(TASK_INTERRUPTIBLE);
@@ -4321,6 +4329,7 @@ static void mgsl_add_device( struct mgsl_struct *info ) 


static const struct tty_port_operations mgsl_port_ops = {

	.carrier_raised = carrier_raised,

	.raise_dtr_rts = raise_dtr_rts,

};

drivers/char/synclink_gt.c

+15 −6
Original line number Diff line number Diff line
@@ -3143,6 +3143,18 @@ static int carrier_raised(struct tty_port *port) 
	return (info->signals & SerialSignal_DCD) ? 1 : 0;

}



static void raise_dtr_rts(struct tty_port *port)

{

	unsigned long flags;

	struct slgt_info *info = container_of(port, struct slgt_info, port);



	spin_lock_irqsave(&info->lock,flags);

	info->signals |= SerialSignal_RTS + SerialSignal_DTR;

 	set_signals(info);

	spin_unlock_irqrestore(&info->lock,flags);

}





/*

 *  block current process until the device is ready to open

 */
@@ -3187,12 +3199,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, 
	port->blocked_open++;



	while (1) {

		if ((tty->termios->c_cflag & CBAUD)) {

			spin_lock_irqsave(&info->lock,flags);

			info->signals |= SerialSignal_RTS + SerialSignal_DTR;

		 	set_signals(info);

			spin_unlock_irqrestore(&info->lock,flags);

		}

		if ((tty->termios->c_cflag & CBAUD))

			tty_port_raise_dtr_rts(port);



		set_current_state(TASK_INTERRUPTIBLE);
@@ -3455,6 +3463,7 @@ static void add_device(struct slgt_info *info) 


static const struct tty_port_operations slgt_port_ops = {

	.carrier_raised = carrier_raised,

	.raise_dtr_rts = raise_dtr_rts,

};



/*