Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: fix race in tty_fasync serial: serial_cs: oxsemi quirk breaks resume serial: imx: bit &/| confusion serial: Fix crash if the minimum rate of the device is > 9600 baud serial-core: resume serial hardware with no_console_suspend serial: 8250_pnp: use wildcard for serial Wacom tablets nozomi: quick fix for the close/close bug compat_ioctl: Supress "unknown cmd" message on serial /dev/console
This commit is contained in:
commit
bdeef61cd0
|
@ -1651,10 +1651,10 @@ static void ntty_close(struct tty_struct *tty, struct file *file)
|
|||
|
||||
dc->open_ttys--;
|
||||
port->count--;
|
||||
tty_port_tty_set(port, NULL);
|
||||
|
||||
if (port->count == 0) {
|
||||
DBG1("close: %d", nport->token_dl);
|
||||
tty_port_tty_set(port, NULL);
|
||||
spin_lock_irqsave(&dc->spin_mutex, flags);
|
||||
dc->last_ier &= ~(nport->token_dl);
|
||||
writew(dc->last_ier, dc->reg_ier);
|
||||
|
|
|
@ -1951,8 +1951,8 @@ static int tty_fasync(int fd, struct file *filp, int on)
|
|||
pid = task_pid(current);
|
||||
type = PIDTYPE_PID;
|
||||
}
|
||||
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
|
||||
retval = __f_setown(filp, pid, type, 0);
|
||||
spin_unlock_irqrestore(&tty->ctrl_lock, flags);
|
||||
if (retval)
|
||||
goto out;
|
||||
} else {
|
||||
|
|
|
@ -328,15 +328,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
|
|||
/* U.S. Robotics 56K Voice INT PnP*/
|
||||
{ "USR9190", 0 },
|
||||
/* Wacom tablets */
|
||||
{ "WACF004", 0 },
|
||||
{ "WACF005", 0 },
|
||||
{ "WACF006", 0 },
|
||||
{ "WACF007", 0 },
|
||||
{ "WACF008", 0 },
|
||||
{ "WACF009", 0 },
|
||||
{ "WACF00A", 0 },
|
||||
{ "WACF00B", 0 },
|
||||
{ "WACF00C", 0 },
|
||||
{ "WACFXXX", 0 },
|
||||
/* Compaq touchscreen */
|
||||
{ "FPI2002", 0 },
|
||||
/* Fujitsu Stylistic touchscreens */
|
||||
|
|
|
@ -1088,7 +1088,7 @@ imx_console_get_options(struct imx_port *sport, int *baud,
|
|||
int *parity, int *bits)
|
||||
{
|
||||
|
||||
if ( readl(sport->port.membase + UCR1) | UCR1_UARTEN ) {
|
||||
if (readl(sport->port.membase + UCR1) & UCR1_UARTEN) {
|
||||
/* ok, the port was enabled */
|
||||
unsigned int ucr2, ubir,ubmr, uartclk;
|
||||
unsigned int baud_raw;
|
||||
|
|
|
@ -385,13 +385,20 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
|
|||
}
|
||||
|
||||
/*
|
||||
* As a last resort, if the quotient is zero,
|
||||
* default to 9600 bps
|
||||
* As a last resort, if the range cannot be met then clip to
|
||||
* the nearest chip supported rate.
|
||||
*/
|
||||
if (!hung_up)
|
||||
tty_termios_encode_baud_rate(termios, 9600, 9600);
|
||||
if (!hung_up) {
|
||||
if (baud <= min)
|
||||
tty_termios_encode_baud_rate(termios,
|
||||
min + 1, min + 1);
|
||||
else
|
||||
tty_termios_encode_baud_rate(termios,
|
||||
max - 1, max - 1);
|
||||
}
|
||||
}
|
||||
|
||||
/* Should never happen */
|
||||
WARN_ON(1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -2006,12 +2013,6 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
|
||||
mutex_lock(&port->mutex);
|
||||
|
||||
if (!console_suspend_enabled && uart_console(uport)) {
|
||||
/* we're going to avoid suspending serial console */
|
||||
mutex_unlock(&port->mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
tty_dev = device_find_child(uport->dev, &match, serial_match_port);
|
||||
if (device_may_wakeup(tty_dev)) {
|
||||
enable_irq_wake(uport->irq);
|
||||
|
@ -2019,20 +2020,23 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
mutex_unlock(&port->mutex);
|
||||
return 0;
|
||||
}
|
||||
uport->suspended = 1;
|
||||
if (console_suspend_enabled || !uart_console(uport))
|
||||
uport->suspended = 1;
|
||||
|
||||
if (port->flags & ASYNC_INITIALIZED) {
|
||||
const struct uart_ops *ops = uport->ops;
|
||||
int tries;
|
||||
|
||||
set_bit(ASYNCB_SUSPENDED, &port->flags);
|
||||
clear_bit(ASYNCB_INITIALIZED, &port->flags);
|
||||
if (console_suspend_enabled || !uart_console(uport)) {
|
||||
set_bit(ASYNCB_SUSPENDED, &port->flags);
|
||||
clear_bit(ASYNCB_INITIALIZED, &port->flags);
|
||||
|
||||
spin_lock_irq(&uport->lock);
|
||||
ops->stop_tx(uport);
|
||||
ops->set_mctrl(uport, 0);
|
||||
ops->stop_rx(uport);
|
||||
spin_unlock_irq(&uport->lock);
|
||||
spin_lock_irq(&uport->lock);
|
||||
ops->stop_tx(uport);
|
||||
ops->set_mctrl(uport, 0);
|
||||
ops->stop_rx(uport);
|
||||
spin_unlock_irq(&uport->lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for the transmitter to empty.
|
||||
|
@ -2047,16 +2051,18 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
drv->dev_name,
|
||||
drv->tty_driver->name_base + uport->line);
|
||||
|
||||
ops->shutdown(uport);
|
||||
if (console_suspend_enabled || !uart_console(uport))
|
||||
ops->shutdown(uport);
|
||||
}
|
||||
|
||||
/*
|
||||
* Disable the console device before suspending.
|
||||
*/
|
||||
if (uart_console(uport))
|
||||
if (console_suspend_enabled && uart_console(uport))
|
||||
console_stop(uport->cons);
|
||||
|
||||
uart_change_pm(state, 3);
|
||||
if (console_suspend_enabled || !uart_console(uport))
|
||||
uart_change_pm(state, 3);
|
||||
|
||||
mutex_unlock(&port->mutex);
|
||||
|
||||
|
@ -2073,29 +2079,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
|
||||
mutex_lock(&port->mutex);
|
||||
|
||||
if (!console_suspend_enabled && uart_console(uport)) {
|
||||
/* no need to resume serial console, it wasn't suspended */
|
||||
/*
|
||||
* First try to use the console cflag setting.
|
||||
*/
|
||||
memset(&termios, 0, sizeof(struct ktermios));
|
||||
termios.c_cflag = uport->cons->cflag;
|
||||
/*
|
||||
* If that's unset, use the tty termios setting.
|
||||
*/
|
||||
if (termios.c_cflag == 0)
|
||||
termios = *state->port.tty->termios;
|
||||
else {
|
||||
termios.c_ispeed = termios.c_ospeed =
|
||||
tty_termios_input_baud_rate(&termios);
|
||||
termios.c_ispeed = termios.c_ospeed =
|
||||
tty_termios_baud_rate(&termios);
|
||||
}
|
||||
uport->ops->set_termios(uport, &termios, NULL);
|
||||
mutex_unlock(&port->mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
tty_dev = device_find_child(uport->dev, &match, serial_match_port);
|
||||
if (!uport->suspended && device_may_wakeup(tty_dev)) {
|
||||
disable_irq_wake(uport->irq);
|
||||
|
@ -2121,21 +2104,23 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
spin_lock_irq(&uport->lock);
|
||||
ops->set_mctrl(uport, 0);
|
||||
spin_unlock_irq(&uport->lock);
|
||||
ret = ops->startup(uport);
|
||||
if (ret == 0) {
|
||||
uart_change_speed(state, NULL);
|
||||
spin_lock_irq(&uport->lock);
|
||||
ops->set_mctrl(uport, uport->mctrl);
|
||||
ops->start_tx(uport);
|
||||
spin_unlock_irq(&uport->lock);
|
||||
set_bit(ASYNCB_INITIALIZED, &port->flags);
|
||||
} else {
|
||||
/*
|
||||
* Failed to resume - maybe hardware went away?
|
||||
* Clear the "initialized" flag so we won't try
|
||||
* to call the low level drivers shutdown method.
|
||||
*/
|
||||
uart_shutdown(state);
|
||||
if (console_suspend_enabled || !uart_console(uport)) {
|
||||
ret = ops->startup(uport);
|
||||
if (ret == 0) {
|
||||
uart_change_speed(state, NULL);
|
||||
spin_lock_irq(&uport->lock);
|
||||
ops->set_mctrl(uport, uport->mctrl);
|
||||
ops->start_tx(uport);
|
||||
spin_unlock_irq(&uport->lock);
|
||||
set_bit(ASYNCB_INITIALIZED, &port->flags);
|
||||
} else {
|
||||
/*
|
||||
* Failed to resume - maybe hardware went away?
|
||||
* Clear the "initialized" flag so we won't try
|
||||
* to call the low level drivers shutdown method.
|
||||
*/
|
||||
uart_shutdown(state);
|
||||
}
|
||||
}
|
||||
|
||||
clear_bit(ASYNCB_SUSPENDED, &port->flags);
|
||||
|
|
|
@ -146,7 +146,8 @@ static void quirk_wakeup_oxsemi(struct pcmcia_device *link)
|
|||
{
|
||||
struct serial_info *info = link->priv;
|
||||
|
||||
outb(12, info->c950ctrl + 1);
|
||||
if (info->c950ctrl)
|
||||
outb(12, info->c950ctrl + 1);
|
||||
}
|
||||
|
||||
/* request_region? oxsemi branch does no request_region too... */
|
||||
|
|
|
@ -1005,6 +1005,9 @@ COMPATIBLE_IOCTL(SCSI_IOCTL_SEND_COMMAND)
|
|||
COMPATIBLE_IOCTL(SCSI_IOCTL_PROBE_HOST)
|
||||
COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI)
|
||||
#endif
|
||||
/* Big V (don't complain on serial console) */
|
||||
IGNORE_IOCTL(VT_OPENQRY)
|
||||
IGNORE_IOCTL(VT_GETMODE)
|
||||
/* Little p (/dev/rtc, /dev/envctrl, etc.) */
|
||||
COMPATIBLE_IOCTL(RTC_AIE_ON)
|
||||
COMPATIBLE_IOCTL(RTC_AIE_OFF)
|
||||
|
|
Loading…
Reference in New Issue