mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
TTY and Serial driver update for 4.7-rc1
Here's the large TTY and Serial driver update for 4.7-rc1. A few new serial drivers are added here, and Peter has fixed a bunch of long-standing bugs in the tty layer and serial drivers as normal. Full details in the shortlog. All of these have been in linux-next for a while with no reported issues. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlc/0/oACgkQMUfUDdst+ynzyQCgsa54VNijdAzU6AA5HEfqmf2M cGMAn1boH7hUWlAbJmzzihx4JASoGjYW =V5VH -----END PGP SIGNATURE----- Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty and serial driver updates from Greg KH: "Here's the large TTY and Serial driver update for 4.7-rc1. A few new serial drivers are added here, and Peter has fixed a bunch of long-standing bugs in the tty layer and serial drivers as normal. Full details in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (88 commits) MAINTAINERS: 8250: remove website reference serial: core: Fix port mutex assert if lockdep disabled serial: 8250_dw: fix wrong logic in dw8250_check_lcr() tty: vt, finish looping on duplicate tty: vt, return error when con_startup fails QE-UART: add "fsl,t1040-ucc-uart" to of_device_id serial: mctrl_gpio: Drop support for out1-gpios and out2-gpios serial: 8250dw: Add device HID for future AMD UART controller Fix OpenSSH pty regression on close serial: mctrl_gpio: add IRQ locking serial: 8250: Integrate Fintek into 8250_base serial: mps2-uart: add support for early console serial: mps2-uart: add MPS2 UART driver dt-bindings: document the MPS2 UART bindings serial: sirf: Use generic uart-has-rtscts DT property serial: sirf: Introduce helper variable struct device_node *np serial: mxs-auart: Use generic uart-has-rtscts DT property serial: imx: Use generic uart-has-rtscts DT property doc: DT: Add Generic Serial Device Tree Bindings serial: 8250: of: Make tegra_serial_handle_break() static ...
This commit is contained in:
commit
e10abc629f
104 changed files with 2528 additions and 1174 deletions
|
|
@ -1680,7 +1680,7 @@ static int acm_resume(struct usb_interface *intf)
|
|||
if (--acm->susp_count)
|
||||
goto out;
|
||||
|
||||
if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
|
||||
if (tty_port_initialized(&acm->port)) {
|
||||
rv = usb_submit_urb(acm->ctrlurb, GFP_ATOMIC);
|
||||
|
||||
for (;;) {
|
||||
|
|
@ -1710,7 +1710,7 @@ static int acm_reset_resume(struct usb_interface *intf)
|
|||
{
|
||||
struct acm *acm = usb_get_intfdata(intf);
|
||||
|
||||
if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags))
|
||||
if (tty_port_initialized(&acm->port))
|
||||
tty_port_tty_hangup(&acm->port, false);
|
||||
|
||||
return acm_resume(intf);
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ static void gs_rx_push(unsigned long _port)
|
|||
req = list_first_entry(queue, struct usb_request, list);
|
||||
|
||||
/* leave data queued if tty was rx throttled */
|
||||
if (tty && test_bit(TTY_THROTTLED, &tty->flags))
|
||||
if (tty && tty_throttled(tty))
|
||||
break;
|
||||
|
||||
switch (req->status) {
|
||||
|
|
@ -579,7 +579,7 @@ static void gs_rx_push(unsigned long _port)
|
|||
* from starving ... but it's not clear that case ever happens.
|
||||
*/
|
||||
if (!list_empty(queue) && tty) {
|
||||
if (!test_bit(TTY_THROTTLED, &tty->flags)) {
|
||||
if (!tty_throttled(tty)) {
|
||||
if (do_push)
|
||||
tasklet_schedule(&port->push);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -601,7 +601,7 @@ sisusbcon_save_screen(struct vc_data *c)
|
|||
|
||||
/* interface routine */
|
||||
static int
|
||||
sisusbcon_set_palette(struct vc_data *c, unsigned char *table)
|
||||
sisusbcon_set_palette(struct vc_data *c, const unsigned char *table)
|
||||
{
|
||||
struct sisusb_usb_data *sisusb;
|
||||
int i, j;
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ static int usb_console_setup(struct console *co, char *options)
|
|||
info->port = port;
|
||||
|
||||
++port->port.count;
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
|
||||
if (!tty_port_initialized(&port->port)) {
|
||||
if (serial->type->set_termios) {
|
||||
/*
|
||||
* allocate a fake tty so the driver can initialize
|
||||
|
|
@ -168,7 +168,7 @@ static int usb_console_setup(struct console *co, char *options)
|
|||
tty_port_tty_set(&port->port, NULL);
|
||||
tty_kref_put(tty);
|
||||
}
|
||||
set_bit(ASYNCB_INITIALIZED, &port->port.flags);
|
||||
tty_port_set_initialized(&port->port, 1);
|
||||
}
|
||||
/* Now that any required fake tty operations are completed restore
|
||||
* the tty port count */
|
||||
|
|
|
|||
|
|
@ -699,8 +699,7 @@ static void digi_set_termios(struct tty_struct *tty,
|
|||
/* don't set RTS if using hardware flow control */
|
||||
/* and throttling input */
|
||||
modem_signals = TIOCM_DTR;
|
||||
if (!C_CRTSCTS(tty) ||
|
||||
!test_bit(TTY_THROTTLED, &tty->flags))
|
||||
if (!C_CRTSCTS(tty) || !tty_throttled(tty))
|
||||
modem_signals |= TIOCM_RTS;
|
||||
digi_set_modem_signals(port, modem_signals, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ static bool usb_serial_generic_msr_changed(struct tty_struct *tty,
|
|||
* Use tty-port initialised flag to detect all hangups including the
|
||||
* one generated at USB-device disconnect.
|
||||
*/
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!tty_port_initialized(&port->port))
|
||||
return true;
|
||||
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
|
|
@ -503,7 +503,7 @@ int usb_serial_generic_tiocmiwait(struct tty_struct *tty, unsigned long arg)
|
|||
|
||||
ret = wait_event_interruptible(port->port.delta_msr_wait,
|
||||
usb_serial_generic_msr_changed(tty, arg, &cnow));
|
||||
if (!ret && !test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!ret && !tty_port_initialized(&port->port))
|
||||
ret = -EIO;
|
||||
|
||||
return ret;
|
||||
|
|
@ -606,7 +606,7 @@ int usb_serial_generic_resume(struct usb_serial *serial)
|
|||
|
||||
for (i = 0; i < serial->num_ports; i++) {
|
||||
port = serial->port[i];
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!tty_port_initialized(&port->port))
|
||||
continue;
|
||||
|
||||
if (port->bulk_in_size) {
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ static void mxuport_process_read_urb_demux_data(struct urb *urb)
|
|||
return;
|
||||
}
|
||||
|
||||
if (test_bit(ASYNCB_INITIALIZED, &demux_port->port.flags)) {
|
||||
if (tty_port_initialized(&demux_port->port)) {
|
||||
ch = data + HEADER_SIZE;
|
||||
mxuport_process_read_urb_data(demux_port, ch, rcv_len);
|
||||
} else {
|
||||
|
|
@ -544,7 +544,7 @@ static void mxuport_process_read_urb_demux_event(struct urb *urb)
|
|||
}
|
||||
|
||||
demux_port = serial->port[rcv_port];
|
||||
if (test_bit(ASYNCB_INITIALIZED, &demux_port->port.flags)) {
|
||||
if (tty_port_initialized(&demux_port->port)) {
|
||||
ch = data + HEADER_SIZE;
|
||||
rcv_event = get_unaligned_be16(data + 2);
|
||||
mxuport_process_read_urb_event(demux_port, ch,
|
||||
|
|
@ -1339,7 +1339,7 @@ static int mxuport_resume(struct usb_serial *serial)
|
|||
|
||||
for (i = 0; i < serial->num_ports; i++) {
|
||||
port = serial->port[i];
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!tty_port_initialized(&port->port))
|
||||
continue;
|
||||
|
||||
r = usb_serial_generic_write_start(port, GFP_NOIO);
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@ static void sierra_close(struct usb_serial_port *port)
|
|||
|
||||
/*
|
||||
* Need to take susp_lock to make sure port is not already being
|
||||
* resumed, but no need to hold it due to ASYNC_INITIALIZED.
|
||||
* resumed, but no need to hold it due to initialized
|
||||
*/
|
||||
spin_lock_irq(&intfdata->susp_lock);
|
||||
if (--intfdata->open_ports == 0)
|
||||
|
|
@ -1039,7 +1039,7 @@ static int sierra_resume(struct usb_serial *serial)
|
|||
for (i = 0; i < serial->num_ports; i++) {
|
||||
port = serial->port[i];
|
||||
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!tty_port_initialized(&port->port))
|
||||
continue;
|
||||
|
||||
err = sierra_submit_delayed_urbs(port);
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ static int serial_open(struct tty_struct *tty, struct file *filp)
|
|||
*
|
||||
* Shut down a USB serial port. Serialized against activate by the
|
||||
* tport mutex and kept to matching open/close pairs
|
||||
* of calls by the ASYNCB_INITIALIZED flag.
|
||||
* of calls by the initialized flag.
|
||||
*
|
||||
* Not called if tty is console.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ void usb_wwan_close(struct usb_serial_port *port)
|
|||
|
||||
/*
|
||||
* Need to take susp_lock to make sure port is not already being
|
||||
* resumed, but no need to hold it due to ASYNC_INITIALIZED.
|
||||
* resumed, but no need to hold it due to initialized
|
||||
*/
|
||||
spin_lock_irq(&intfdata->susp_lock);
|
||||
if (--intfdata->open_ports == 0)
|
||||
|
|
@ -682,7 +682,7 @@ int usb_wwan_resume(struct usb_serial *serial)
|
|||
for (i = 0; i < serial->num_ports; i++) {
|
||||
port = serial->port[i];
|
||||
|
||||
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
|
||||
if (!tty_port_initialized(&port->port))
|
||||
continue;
|
||||
|
||||
portdata = usb_get_serial_port_data(port);
|
||||
|
|
|
|||
Loading…
Reference in a new issue