korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

USB: serial: stop reporting legacy UART types

Browse Source 
The TIOCGSERIAL ioctl can be used to set and retrieve the UART type for
legacy UARTs, but some USB serial drivers have been reporting back
random types in order to "make user-space happy".

Some applications have historically expected TIOCGSERIAL to be
implemented, but judging from the Debian sources, the port type not
being PORT_UNKNOWN is only used to check for the existence of legacy
serial ports (ttySn).

Drivers like ftdi_sio have been using PORT_UNKNOWN for twenty years (and
option for 10 years) without anyone complaining so let's stop reporting
back anything else.

In the unlikely event that this do cause problems, this should be fixed
tree-wide anyway (e.g. for all USB serial drivers and also CDC-ACM).

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2021-04-07 12:39:22 +02:00
parent 01fd45f676
commit f64d74a59c
11 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/serial/ark3116.c
View File

@ -385,12 +385,6 @@ err_free:
return result; return result;
} }
static void ark3116_get_serial_info(struct tty_struct *tty,
struct serial_struct *ss)
{
ss->type = PORT_16654;
}
static int ark3116_tiocmget(struct tty_struct *tty) static int ark3116_tiocmget(struct tty_struct *tty)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
@ -627,7 +621,6 @@ static struct usb_serial_driver ark3116_device = {
.port_probe = ark3116_port_probe, .port_probe = ark3116_port_probe,
.port_remove = ark3116_port_remove, .port_remove = ark3116_port_remove,
.set_termios = ark3116_set_termios, .set_termios = ark3116_set_termios,
.get_serial = ark3116_get_serial_info,
.tiocmget = ark3116_tiocmget, .tiocmget = ark3116_tiocmget,
.tiocmset = ark3116_tiocmset, .tiocmset = ark3116_tiocmset,
.tiocmiwait = usb_serial_generic_tiocmiwait, .tiocmiwait = usb_serial_generic_tiocmiwait,

1
drivers/usb/serial/f81232.c
View File

@ -825,7 +825,6 @@ static void f81232_get_serial(struct tty_struct *tty, struct serial_struct *ss)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct f81232_private *priv = usb_get_serial_port_data(port); struct f81232_private *priv = usb_get_serial_port_data(port);
ss->type = PORT_16550A;
ss->baud_base = priv->baud_base; ss->baud_base = priv->baud_base;
} }

1
drivers/usb/serial/f81534.c
View File

@ -1147,7 +1147,6 @@ static void f81534_get_serial_info(struct tty_struct *tty, struct serial_struct
port_priv = usb_get_serial_port_data(port); port_priv = usb_get_serial_port_data(port);
ss->type = PORT_16550A;
ss->baud_base = port_priv->baud_base; ss->baud_base = port_priv->baud_base;
} }

10
drivers/usb/serial/io_edgeport.c
View File

@ -1594,12 +1594,6 @@ static int edge_tiocmget(struct tty_struct *tty)
return result; return result;
} }
static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{
ss->type = PORT_16550A;
}
/***************************************************************************** /*****************************************************************************
* SerialIoctl * SerialIoctl
* this function handles any ioctl calls to the driver * this function handles any ioctl calls to the driver
@ -3061,7 +3055,6 @@ static struct usb_serial_driver edgeport_2port_device = {
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,
.get_serial = get_serial_info,
.tiocmiwait = usb_serial_generic_tiocmiwait, .tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount, .get_icount = usb_serial_generic_get_icount,
.write = edge_write, .write = edge_write,
@ -3097,7 +3090,6 @@ static struct usb_serial_driver edgeport_4port_device = {
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,
.get_serial = get_serial_info,
.tiocmiwait = usb_serial_generic_tiocmiwait, .tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount, .get_icount = usb_serial_generic_get_icount,
.write = edge_write, .write = edge_write,
@ -3133,7 +3125,6 @@ static struct usb_serial_driver edgeport_8port_device = {
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,
.get_serial = get_serial_info,
.tiocmiwait = usb_serial_generic_tiocmiwait, .tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount, .get_icount = usb_serial_generic_get_icount,
.write = edge_write, .write = edge_write,
@ -3169,7 +3160,6 @@ static struct usb_serial_driver epic_device = {
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,
.get_serial = get_serial_info,
.tiocmiwait = usb_serial_generic_tiocmiwait, .tiocmiwait = usb_serial_generic_tiocmiwait,
.get_icount = usb_serial_generic_get_icount, .get_icount = usb_serial_generic_get_icount,
.write = edge_write, .write = edge_write,

7
drivers/usb/serial/io_ti.c
View File

@ -2433,11 +2433,6 @@ static int edge_tiocmget(struct tty_struct *tty)
return result; return result;
} }
static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{
ss->type = PORT_16550A;
}
static void edge_break(struct tty_struct *tty, int break_state) static void edge_break(struct tty_struct *tty, int break_state)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
@ -2696,7 +2691,6 @@ static struct usb_serial_driver edgeport_1port_device = {
.release = edge_release, .release = edge_release,
.port_probe = edge_port_probe, .port_probe = edge_port_probe,
.port_remove = edge_port_remove, .port_remove = edge_port_remove,
.get_serial = get_serial_info,
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,
@ -2735,7 +2729,6 @@ static struct usb_serial_driver edgeport_2port_device = {
.release = edge_release, .release = edge_release,
.port_probe = edge_port_probe, .port_probe = edge_port_probe,
.port_remove = edge_port_remove, .port_remove = edge_port_remove,
.get_serial = get_serial_info,
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
.tiocmset = edge_tiocmset, .tiocmset = edge_tiocmset,

6
drivers/usb/serial/mos7720.c
View File

@ -1634,11 +1634,6 @@ static int mos7720_tiocmset(struct tty_struct *tty,
return 0; return 0;
} }
static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{
ss->type = PORT_16550A;
}
static int mos7720_ioctl(struct tty_struct *tty, static int mos7720_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
@ -1778,7 +1773,6 @@ static struct usb_serial_driver moschip7720_2port_driver = {
.ioctl = mos7720_ioctl, .ioctl = mos7720_ioctl,
.tiocmget = mos7720_tiocmget, .tiocmget = mos7720_tiocmget,
.tiocmset = mos7720_tiocmset, .tiocmset = mos7720_tiocmset,
.get_serial = get_serial_info,
.set_termios = mos7720_set_termios, .set_termios = mos7720_set_termios,
.write = mos7720_write, .write = mos7720_write,
.write_room = mos7720_write_room, .write_room = mos7720_write_room,

11
drivers/usb/serial/mos7840.c
View File

@ -1383,16 +1383,6 @@ static int mos7840_get_lsr_info(struct tty_struct *tty,
return 0; return 0;
} }
/*****************************************************************************
* mos7840_get_serial_info
* function to get information about serial port
*****************************************************************************/
static void mos7840_get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{
ss->type = PORT_16550A;
}
/***************************************************************************** /*****************************************************************************
* SerialIoctl * SerialIoctl
* this function handles any ioctl calls to the driver * this function handles any ioctl calls to the driver
@ -1771,7 +1761,6 @@ static struct usb_serial_driver moschip7840_4port_device = {
.probe = mos7840_probe, .probe = mos7840_probe,
.attach = mos7840_attach, .attach = mos7840_attach,
.ioctl = mos7840_ioctl, .ioctl = mos7840_ioctl,
.get_serial = mos7840_get_serial_info,
.set_termios = mos7840_set_termios, .set_termios = mos7840_set_termios,
.break_ctl = mos7840_break, .break_ctl = mos7840_break,
.tiocmget = mos7840_tiocmget, .tiocmget = mos7840_tiocmget,

7
drivers/usb/serial/opticon.c
View File

@ -352,12 +352,6 @@ static int opticon_tiocmset(struct tty_struct *tty,
return 0; return 0;
} }
static void get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{
/* fake emulate a 16550 uart to make userspace code happy */
ss->type = PORT_16550A;
}
static int opticon_port_probe(struct usb_serial_port *port) static int opticon_port_probe(struct usb_serial_port *port)
{ {
struct opticon_private *priv; struct opticon_private *priv;
@ -399,7 +393,6 @@ static struct usb_serial_driver opticon_device = {
.chars_in_buffer = opticon_chars_in_buffer, .chars_in_buffer = opticon_chars_in_buffer,
.throttle = usb_serial_generic_throttle, .throttle = usb_serial_generic_throttle,
.unthrottle = usb_serial_generic_unthrottle, .unthrottle = usb_serial_generic_unthrottle,
.get_serial = get_serial_info,
.tiocmget = opticon_tiocmget, .tiocmget = opticon_tiocmget,
.tiocmset = opticon_tiocmset, .tiocmset = opticon_tiocmset,
.process_read_urb = opticon_process_read_urb, .process_read_urb = opticon_process_read_urb,

6
drivers/usb/serial/pl2303.c
View File

@ -1048,11 +1048,6 @@ static int pl2303_carrier_raised(struct usb_serial_port *port)
return 0; return 0;
} }
static void pl2303_get_serial(struct tty_struct *tty, struct serial_struct *ss)
{
ss->type = PORT_16654;
}
static void pl2303_set_break(struct usb_serial_port *port, bool enable) static void pl2303_set_break(struct usb_serial_port *port, bool enable)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
@ -1236,7 +1231,6 @@ static struct usb_serial_driver pl2303_device = {
.close = pl2303_close, .close = pl2303_close,
.dtr_rts = pl2303_dtr_rts, .dtr_rts = pl2303_dtr_rts,
.carrier_raised = pl2303_carrier_raised, .carrier_raised = pl2303_carrier_raised,
.get_serial = pl2303_get_serial,
.break_ctl = pl2303_break_ctl, .break_ctl = pl2303_break_ctl,
.set_termios = pl2303_set_termios, .set_termios = pl2303_set_termios,
.tiocmget = pl2303_tiocmget, .tiocmget = pl2303_tiocmget,

1
drivers/usb/serial/ti_usb_3410_5052.c
View File

@ -1393,7 +1393,6 @@ static void ti_get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
struct ti_port *tport = usb_get_serial_port_data(port); struct ti_port *tport = usb_get_serial_port_data(port);
ss->type = PORT_16550A;
ss->baud_base = tport->tp_tdev->td_is_3410 ? 921600 : 460800; ss->baud_base = tport->tp_tdev->td_is_3410 ? 921600 : 460800;
} }

1
drivers/usb/serial/whiteheat.c
View File

@ -441,7 +441,6 @@ static int whiteheat_tiocmset(struct tty_struct *tty,
static void whiteheat_get_serial(struct tty_struct *tty, struct serial_struct *ss) static void whiteheat_get_serial(struct tty_struct *tty, struct serial_struct *ss)
{ {
ss->type = PORT_16654;
ss->baud_base = 460800; ss->baud_base = 460800;
} }