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

Commit d14fc1a7 authored by Libor Pechacek's avatar Libor Pechacek Committed by Greg Kroah-Hartman
Browse files

USB: serial: handle Data Carrier Detect changes 



Alan's commit 335f8514 introduced
.carrier_raised function in several drivers.  That also means
tty_port_block_til_ready can now suspend the process trying to open the serial
port when Carrier Detect is low and put it into tty_port.open_wait queue.  We
need to wake up the process when Carrier Detect goes high and trigger TTY
hangup when CD goes low.

Some of the devices do not report modem status line changes, or at least we
don't understand the status message, so for those we remove .carrier_raised
again.

Signed-off-by: default avatarLibor Pechacek <lpechacek@suse.cz>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca9cfea0

drivers/usb/serial/ch341.c

+10 −0
Original line number Diff line number Diff line
@@ -486,12 +486,22 @@ static void ch341_read_int_callback(struct urb *urb) 
	if (actual_length >= 4) {

		struct ch341_private *priv = usb_get_serial_port_data(port);

		unsigned long flags;

		u8 prev_line_status = priv->line_status;



		spin_lock_irqsave(&priv->lock, flags);

		priv->line_status = (~(data[2])) & CH341_BITS_MODEM_STAT;

		if ((data[1] & CH341_MULT_STAT))

			priv->multi_status_change = 1;

		spin_unlock_irqrestore(&priv->lock, flags);



		if ((priv->line_status ^ prev_line_status) & CH341_BIT_DCD) {

			struct tty_struct *tty = tty_port_tty_get(&port->port);

			if (tty)

				usb_serial_handle_dcd_change(port, tty,

					    priv->line_status & CH341_BIT_DCD);

			tty_kref_put(tty);

		}



		wake_up_interruptible(&priv->delta_msr_wait);

	}

drivers/usb/serial/cp210x.c

+1 −12
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *, 
static void cp210x_break_ctl(struct tty_struct *, int);

static int cp210x_startup(struct usb_serial *);

static void cp210x_dtr_rts(struct usb_serial_port *p, int on);

static int cp210x_carrier_raised(struct usb_serial_port *p);



static int debug;
@@ -166,8 +165,7 @@ static struct usb_serial_driver cp210x_device = { 
	.tiocmget 		= cp210x_tiocmget,

	.tiocmset		= cp210x_tiocmset,

	.attach			= cp210x_startup,

	.dtr_rts		= cp210x_dtr_rts,

	.carrier_raised		= cp210x_carrier_raised

	.dtr_rts		= cp210x_dtr_rts

};



/* Config request types */
@@ -766,15 +764,6 @@ static int cp210x_tiocmget (struct tty_struct *tty, struct file *file) 
	return result;

}



static int cp210x_carrier_raised(struct usb_serial_port *p)

{

	unsigned int control;

	cp210x_get_config(p, CP210X_GET_MDMSTS, &control, 1);

	if (control & CONTROL_DCD)

		return 1;

	return 0;

}



static void cp210x_break_ctl (struct tty_struct *tty, int break_state)

{

	struct usb_serial_port *port = tty->driver_data;

drivers/usb/serial/digi_acceleport.c

+0 −10
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ static int digi_write_room(struct tty_struct *tty); 
static int digi_chars_in_buffer(struct tty_struct *tty);

static int digi_open(struct tty_struct *tty, struct usb_serial_port *port);

static void digi_close(struct usb_serial_port *port);

static int digi_carrier_raised(struct usb_serial_port *port);

static void digi_dtr_rts(struct usb_serial_port *port, int on);

static int digi_startup_device(struct usb_serial *serial);

static int digi_startup(struct usb_serial *serial);
@@ -511,7 +510,6 @@ static struct usb_serial_driver digi_acceleport_2_device = { 
	.open =				digi_open,

	.close =			digi_close,

	.dtr_rts =			digi_dtr_rts,

	.carrier_raised =		digi_carrier_raised,

	.write =			digi_write,

	.write_room =			digi_write_room,

	.write_bulk_callback = 		digi_write_bulk_callback,
@@ -1339,14 +1337,6 @@ static void digi_dtr_rts(struct usb_serial_port *port, int on) 
	digi_set_modem_signals(port, on * (TIOCM_DTR|TIOCM_RTS), 1);

}



static int digi_carrier_raised(struct usb_serial_port *port)

{

	struct digi_port *priv = usb_get_serial_port_data(port);

	if (priv->dp_modem_signals & TIOCM_CD)

		return 1;

	return 0;

}



static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)

{

	int ret;

drivers/usb/serial/generic.c

+20 −0
Original line number Diff line number Diff line
@@ -479,6 +479,26 @@ int usb_serial_handle_break(struct usb_serial_port *port) 
}

EXPORT_SYMBOL_GPL(usb_serial_handle_break);



/**

 *	usb_serial_handle_dcd_change - handle a change of carrier detect state

 *	@port: usb_serial_port structure for the open port

 *	@tty: tty_struct structure for the port

 *	@status: new carrier detect status, nonzero if active

 */

void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port,

				struct tty_struct *tty, unsigned int status)

{

	struct tty_port *port = &usb_port->port;



	dbg("%s - port %d, status %d", __func__, usb_port->number, status);



	if (status)

		wake_up_interruptible(&port->open_wait);

	else if (tty && !C_CLOCAL(tty))

		tty_hangup(tty);

}

EXPORT_SYMBOL_GPL(usb_serial_handle_dcd_change);



int usb_serial_generic_resume(struct usb_serial *serial)

{

	struct usb_serial_port *port;

drivers/usb/serial/keyspan_pda.c

+0 −17
Original line number Diff line number Diff line
@@ -679,22 +679,6 @@ static void keyspan_pda_dtr_rts(struct usb_serial_port *port, int on) 
	}

}



static int keyspan_pda_carrier_raised(struct usb_serial_port *port)

{

	struct usb_serial *serial = port->serial;

	unsigned char modembits;



	/* If we can read the modem status and the DCD is low then

	   carrier is not raised yet */

	if (keyspan_pda_get_modem_info(serial, &modembits) >= 0) {

		if (!(modembits & (1>>6)))

			return 0;

	}

	/* Carrier raised, or we failed (eg disconnected) so

	   progress accordingly */

	return 1;

}





static int keyspan_pda_open(struct tty_struct *tty,

					struct usb_serial_port *port)
@@ -881,7 +865,6 @@ static struct usb_serial_driver keyspan_pda_device = { 
	.id_table =		id_table_std,

	.num_ports =		1,

	.dtr_rts =		keyspan_pda_dtr_rts,

	.carrier_raised	=	keyspan_pda_carrier_raised,

	.open =			keyspan_pda_open,

	.close =		keyspan_pda_close,

	.write =		keyspan_pda_write,