* [GIT PATCH] TTY fixes for 2.6.32-git
@ 2009-12-01 17:43 Greg KH
2009-12-01 17:59 ` [PATCH 1/3] tty_port: handle the nonblocking open of a dead port corner case Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Greg KH @ 2009-12-01 17:43 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel
Here are 3 tty bugfixs for your kernel tree. One fixes a regression
from 2.6.30, one fixes a build error, and the last one adds a new device
id.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/
Both of these patches have been in the -next and -mm trees for a while.
Both patches will be sent to the linux-kernel mailing list, if anyone
wants to see it.
thanks,
greg k-h
------------
drivers/char/tty_port.c | 7 +++++--
drivers/serial/bcm63xx_uart.c | 4 ++--
drivers/serial/of_serial.c | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
---------------
Alan Cox (1):
tty_port: handle the nonblocking open of a dead port corner case
Maxime Bizon (1):
bcm63xx_uart: Fix serial driver compile breakage.
Michal Simek (1):
tty/of_serial: add missing ns16550a id
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] tty_port: handle the nonblocking open of a dead port corner case
2009-12-01 17:43 [GIT PATCH] TTY fixes for 2.6.32-git Greg KH
@ 2009-12-01 17:59 ` Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 2/3] bcm63xx_uart: Fix serial driver compile breakage Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 3/3] tty/of_serial: add missing ns16550a id Greg Kroah-Hartman
2 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2009-12-01 17:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Alan Cox, stable, Greg Kroah-Hartman
From: Alan Cox <alan@linux.intel.com>
Some drivers allow O_NDELAY of a dead port (eg for setserial to work). In that
situation we must not try to raise the carrier.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/char/tty_port.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 2e8552d..c63f3d3 100644
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -219,8 +219,11 @@ int tty_port_block_til_ready(struct tty_port *port,
/* if non-blocking mode is set we can pass directly to open unless
the port has just hung up or is in another error state */
- if ((filp->f_flags & O_NONBLOCK) ||
- (tty->flags & (1 << TTY_IO_ERROR))) {
+ if (tty->flags & (1 << TTY_IO_ERROR)) {
+ port->flags |= ASYNC_NORMAL_ACTIVE;
+ return 0;
+ }
+ if (filp->f_flags & O_NONBLOCK) {
/* Indicate we are open */
if (tty->termios->c_cflag & CBAUD)
tty_port_raise_dtr_rts(port);
--
1.6.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] bcm63xx_uart: Fix serial driver compile breakage.
2009-12-01 17:43 [GIT PATCH] TTY fixes for 2.6.32-git Greg KH
2009-12-01 17:59 ` [PATCH 1/3] tty_port: handle the nonblocking open of a dead port corner case Greg Kroah-Hartman
@ 2009-12-01 17:59 ` Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 3/3] tty/of_serial: add missing ns16550a id Greg Kroah-Hartman
2 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2009-12-01 17:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Maxime Bizon, Greg Kroah-Hartman
From: Maxime Bizon <mbizon@freebox.fr>
The driver missed a small API change while sitting in Ralf's tree, this
patch makes it compile again.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/serial/bcm63xx_uart.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c
index beddaa6..37ad0c4 100644
--- a/drivers/serial/bcm63xx_uart.c
+++ b/drivers/serial/bcm63xx_uart.c
@@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
* higher than fifo size anyway since we're much faster than
* serial port */
max_count = 32;
- tty = port->info->port.tty;
+ tty = port->state->port.tty;
do {
unsigned int iestat, c, cstat;
char flag;
@@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_port *port)
return;
}
- xmit = &port->info->xmit;
+ xmit = &port->state->xmit;
if (uart_circ_empty(xmit))
goto txq_empty;
--
1.6.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] tty/of_serial: add missing ns16550a id
2009-12-01 17:43 [GIT PATCH] TTY fixes for 2.6.32-git Greg KH
2009-12-01 17:59 ` [PATCH 1/3] tty_port: handle the nonblocking open of a dead port corner case Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 2/3] bcm63xx_uart: Fix serial driver compile breakage Greg Kroah-Hartman
@ 2009-12-01 17:59 ` Greg Kroah-Hartman
2 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2009-12-01 17:59 UTC (permalink / raw)
To: linux-kernel; +Cc: Michal Simek, Arnd Bergmann, Greg Kroah-Hartman
From: Michal Simek <monstr@monstr.eu>
Many boards have a bug-free ns16550 compatible serial port, which we should
register as PORT_16550A. This introduces a new value "ns16550a" for the
compatible property of of_serial to let a firmware choose that model instead
of using the crippled PORT_16550 mode.
Reported-by: Alon Ziv <alonz@nolaviz.org>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/serial/of_serial.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 02406ba..cdf172e 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -161,6 +161,7 @@ static int of_platform_serial_remove(struct of_device *ofdev)
static struct of_device_id __devinitdata of_platform_serial_table[] = {
{ .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, },
{ .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, },
+ { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, },
{ .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, },
{ .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, },
{ .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, },
--
1.6.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [GIT PATCH] TTY fixes for 2.6.32-git
@ 2009-11-18 1:00 Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2009-11-18 1:00 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel
Here are 2 tty bugfixs for your kernel tree. It fixes a regression that
showed up in 2.6.31 with the cp210x driver.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/
Both of these patches have been in the -next and -mm trees for a while.
Both patches will be sent to the linux-kernel mailing list, if anyone
wants to see it.
thanks,
greg k-h
------------
drivers/char/tty_port.c | 3 +++
drivers/usb/serial/cp210x.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
---------------
Alan Cox (2):
tty_port: If we are opened non blocking we still need to raise the carrier
tty: cp210x: Fix carrier handling
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-12-01 18:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-01 17:43 [GIT PATCH] TTY fixes for 2.6.32-git Greg KH
2009-12-01 17:59 ` [PATCH 1/3] tty_port: handle the nonblocking open of a dead port corner case Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 2/3] bcm63xx_uart: Fix serial driver compile breakage Greg Kroah-Hartman
2009-12-01 17:59 ` [PATCH 3/3] tty/of_serial: add missing ns16550a id Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2009-11-18 1:00 [GIT PATCH] TTY fixes for 2.6.32-git Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.