TTY/Serial merge for .37-rc1
Subsystems (19)
PATCH 1/1 TTY/Serial merge for .37-rc1
Here is the big tty and serial merge for .37-rc1
There's a nice ioctls.h cleanup and a number of serial driver updates, and some core tty fixes and reworks from Alan. Nothing major, just incremental stuff.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/
These patches have been in the linux-next tree and -mm for a while now.
Patches will be sent to the linux-kernel mailing list, if anyone wants to see them.
thanks,
greg k-h
------------
Documentation/devices.txt | 1 + Documentation/filesystems/proc.txt | 32 +++ MAINTAINERS | 10 +- arch/arm/include/asm/ioctls.h | 83 +-------- arch/avr32/include/asm/ioctls.h | 86 +-------- arch/cris/include/asm/ioctls.h | 84 +-------- arch/frv/include/asm/ioctls.h | 80 +------- arch/h8300/include/asm/ioctls.h | 81 +-------- arch/ia64/hp/sim/simserial.c | 12 +- arch/ia64/include/asm/ioctls.h | 89 +-------- arch/m32r/include/asm/ioctls.h | 83 +-------- arch/m68k/include/asm/ioctls.h | 80 +------- arch/mips/alchemy/common/platform.c | 28 +++ arch/mips/alchemy/common/power.c | 35 ---- arch/mn10300/include/asm/ioctls.h | 84 +-------- arch/s390/include/asm/ioctls.h | 88 +-------- drivers/char/Kconfig | 15 ++ drivers/char/Makefile | 1 + drivers/char/amiserial.c | 56 +++--- drivers/char/cyclades.c | 49 +++-- drivers/char/ip2/ip2main.c | 72 ++++--- drivers/char/mxser.c | 109 ++++++----- drivers/char/nozomi.c | 37 ++-- drivers/char/pcmcia/synclink_cs.c | 60 +++--- drivers/char/pty.c | 4 +- drivers/char/synclink.c | 73 +++---- drivers/char/synclink_gt.c | 55 +++--- drivers/char/synclinkmp.c | 61 +++--- drivers/char/tty_io.c | 77 +++++++- drivers/char/ttyprintk.c | 225 +++++++++++++++++++++ drivers/char/vc_screen.c | 135 +++++++++++++ drivers/char/vt.c | 5 + drivers/input/serio/serport.c | 1 + drivers/net/usb/hso.c | 35 ++-- drivers/serial/68360serial.c | 51 +++--- drivers/serial/8250.c | 69 ++++--- drivers/serial/Kconfig | 7 - drivers/serial/altera_uart.c | 156 ++++++++++----- drivers/serial/bfin_sport_uart.c | 7 +- drivers/serial/imx.c | 5 +- drivers/serial/jsm/jsm_driver.c | 4 +- drivers/serial/max3107.c | 34 +++- drivers/serial/mfd.c | 47 +++-- drivers/serial/mrst_max3110.c | 358 ++++++++++++++++++++------------- drivers/serial/mrst_max3110.h | 1 + drivers/serial/serial_core.c | 51 +++-- drivers/serial/uartlite.c | 26 +++- drivers/usb/serial/ark3116.c | 40 ++-- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/io_edgeport.c | 49 +++-- drivers/usb/serial/io_tables.h | 4 + drivers/usb/serial/io_ti.c | 29 ++- drivers/usb/serial/mos7720.c | 54 +++--- drivers/usb/serial/mos7840.c | 53 +++--- drivers/usb/serial/ssu100.c | 48 +++-- drivers/usb/serial/ti_usb_3410_5052.c | 37 +++- drivers/usb/serial/usb-serial.c | 13 ++ fs/proc/proc_tty.c | 158 +++++++++++++++ include/asm-generic/ioctls.h | 2 + include/linux/altera_uart.h | 5 + include/linux/selection.h | 1 + include/linux/serial_8250.h | 8 + include/linux/serial_core.h | 10 + include/linux/tty.h | 3 +- include/linux/tty_driver.h | 9 + include/linux/usb/serial.h | 2 + net/bluetooth/rfcomm/tty.c | 4 - 67 files changed, 1759 insertions(+), 1613 deletions(-) create mode 100644 drivers/char/ttyprintk.c
---------------
Alan Cox (6):
serial: mrst_max3110: Make the IRQ option runtime
tty: Make tiocgicount a handler
tty: Convert the USB drivers to the new icount interface
tty: icount changeover for other main devices
tty: Fix warning left over from TIOCGICOUNT changes
serial: abstraction for 8250 legacy ports
Anton Vorontsov (8):
serial: Factor out uart_poll_timeout() from 8250 driver
altera_uart: Add support for polling mode (IRQ-less)
altera_uart: Add support for getting mapbase and IRQ from resources
altera_uart: Add support for different address strides
altera_uart: Make it possible to use Altera UART and 8250 ports together
altera_uart: Fixup type usage of port flags
altera_uart: Fix missing prototype for registering an early console
altera_uart: Don't use plain integer as NULL pointer
Breno Leitao (2):
tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
jsm: Remove the uart port on errors
Dan Carpenter (1):
serial: mfd: snprintf() returns largish values
Daniel Drake (1):
serial8250: ratelimit "too much work" error
David Daney (1):
serial: 8250: Don't delay after transmitter is ready.
Davidlohr Bueso (1):
serial: max3107: Fix memory leaks when returning on error
Dmitry Eremin-Solenikov (2):
tty: add tty_struct->dev pointer to corresponding device instance
serport: place serport serio device correctly in the device tree
Dr. Werner Fink (1):
tty: Add a new file /proc/tty/consoles
Feng Tang (2):
serial: mrst_max3110: some code cleanup
serial: mfd: add more baud rates support
Greg Kroah-Hartman (1):
serial: mark the 8250 driver as maintained
Jason Wang (2):
serial-core: skip call set_termios/console_start when no_console_suspend
serial-core: restore termios settings when resume console ports
Jeff Mahoney (10):
ioctl: Use asm-generic/ioctls.h on arm (enables termiox)
ioctl: Use asm-generic/ioctls.h on avr32 (enables termiox)
ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
ioctl: Use asm-generic/ioctls.h on frv (enables termiox)
ioctl: Use asm-generic/ioctls.h on h8300 (enables termiox)
ioctl: Use asm-generic/ioctls.h on ia64 (enables termiox)
ioctl: Use asm-generic/ioctls.h on m32r (enables termiox)
ioctl: Use asm-generic/ioctls.h on m68k (enables termiox)
ioctl: Use asm-generic/ioctls.h on mn10300 (enables termiox)
ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)
Jiri Slaby (1):
Char: mxser, call pci_disable_device from probe/remove
Manuel Lauss (2):
8250: allow platforms to override PM hook.
Alchemy: Add UART PM methods.
Michal Simek (1):
serial: Add CONSOLE_POLL support for uartlite
Nicolas Pitre (2):
vcs: add poll/fasync support
vcs: invoke the vt update callback when /dev/vcs* is written to
Pekka Enberg (1):
tty: Remove __GFP_NOFAIL from tty_add_file()
Samo Pogacnik (1):
add ttyprintk driver
Sonic Zhang (1):
serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
Vasiliy Kulikov (1):
tty_io: check return code of tty_register_device
Volker Ernst (1):
serial/imx: check that the buffer is non-empty before sending it out
PATCH 1/49 tty: add tty_struct->dev pointer to corresponding device instance
From: Dmitry Eremin-Solenikov <[email protected]>
Some device drivers (mostly tty line disciplines) would like to have way know a struct device instance corresponding to passed tty_struct. Add a struct device pointer to struct tty_struct and populate it during initialize_tty_struct().
--- drivers/char/tty_io.c | 17 +++++++++++++++++ include/linux/tty.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-)
drivers/char/tty_io.c +17 -0
@@ -183,6 +183,8 @@ struct tty_struct *alloc_tty_struct(void)void free_tty_struct (struct tty_struct *tty) { +if (tty->dev) +put_device (tty->dev);kfree (tty->write_buf);tty_buffer_free_all (tty);kfree (tty);
@@ -2783,6 +2785,20 @@ void do_SAK(struct tty_struct *tty)EXPORT_SYMBOL (do_SAK); +static int dev_match_devt (struct device *dev,void *data) +{ +dev_t *devt = data; +return dev->devt == *devt; +} + +/* Must put_device() after it's unused! */ +static struct device *tty_get_device (struct tty_struct *tty) +{ +dev_t devt =tty_devnum (tty); +return class_find_device (tty_class,NULL , &devt, dev_match_devt); +} + +/** * initialize_tty_struct * @tty: tty to initialize
@@ -2823,6 +2839,7 @@ void initialize_tty_struct(struct tty_struct *tty, tty->ops = driver->ops; tty->index = idx;tty_line_name (driver, idx, tty->name); + tty->dev =tty_get_device (tty); }/**
include/linux/tty.h +1 -0
@@ -256,6 +256,7 @@ struct tty_operations;struct tty_struct {int magic;struct kref kref; +struct device *dev;struct tty_driver *driver;const struct tty_operations *ops;int index;
Signature · 1 line
1.7.2
PATCH 3/49 serial: mfd: snprintf() returns largish values
In reply to Greg KHFrom: Dan Carpenter <[email protected]>
snprintf() returns the number of bytes which would have been written so it can be larger than the size of the buffer. In this case it's fine, but people copy and paste this code so I've fixed it.
--- drivers/serial/mfd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/serial/mfd.c +6 -0
@@ -172,6 +172,9 @@ static ssize_t port_show_regs(struct file *file, char __user *user_buf, len +=snprintf (buf + len,HSU_REGS_BUFSIZE - len,"DIV: \t\t0x%08x\n" ,serial_in (up,UART_DIV )); +if (len >HSU_REGS_BUFSIZE ) + len =HSU_REGS_BUFSIZE ; + ret =simple_read_from_buffer (user_buf, count, ppos, buf, len);kfree (buf);return ret;
@@ -219,6 +222,9 @@ static ssize_t dma_show_regs(struct file *file, char __user *user_buf, len +=snprintf (buf + len,HSU_REGS_BUFSIZE - len,"D0TSR: \t\t0x%08x\n" ,chan_readl (chan,HSU_CH_D3TSR )); +if (len >HSU_REGS_BUFSIZE ) + len =HSU_REGS_BUFSIZE ; + ret =simple_read_from_buffer (user_buf, count, ppos, buf, len);kfree (buf);return ret;
Signature · 1 line
1.7.2
PATCH 5/49 tty: Remove __GFP_NOFAIL from tty_add_file()
In reply to Greg KHFrom: Pekka Enberg <[email protected]>
This patch removes __GFP_NOFAIL use from tty_add_file() and adds proper error handling to the call-sites of the function.
--- drivers/char/pty.c | 4 +++- drivers/char/tty_io.c | 15 +++++++++++---- include/linux/tty.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/char/pty.c +3 -1
@@ -676,7 +676,9 @@ static int ptmx_open(struct inode *inode, struct file *filp)set_bit (TTY_PTY_LOCK , &tty->flags);/* LOCK THE SLAVE */ -tty_add_file (tty, filp); + retval =tty_add_file (tty, filp); +if (retval) + goto out; retval =devpts_pty_new (inode, tty->link);if (retval)
drivers/char/tty_io.c +11 -4
@@ -196,12 +196,13 @@ static inline struct tty_struct *file_tty(struct file *file) }/* Associate a new file with the tty structure */ -void tty_add_file (struct tty_struct *tty,struct file *file) +int tty_add_file (struct tty_struct *tty,struct file *file) {struct tty_file_private *priv; -/* XXX: must implement proper error handling in callers */ - priv =kmalloc (sizeof (*priv),GFP_KERNEL |__GFP_NOFAIL); + priv =kmalloc (sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; priv->tty = tty; priv->file = file;
@@ -210,6 +211,8 @@ void tty_add_file(struct tty_struct *tty, struct file *file)spin_lock (&tty_files_lock);list_add (&priv->list, &tty->tty_files);spin_unlock (&tty_files_lock); + +return 0 ; }/* Delete file from its tty */
@@ -1877,7 +1880,11 @@ got_driver:return PTR_ERR (tty); } -tty_add_file (tty, filp); + retval =tty_add_file (tty, filp); +if (retval) { +tty_unlock (); +return retval; + }check_tty_count (tty,"tty_open" ); if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
include/linux/tty.h +1 -1
@@ -466,7 +466,7 @@ extern void proc_clear_tty(struct task_struct *p);extern struct tty_struct *get_current_tty (void );extern void tty_default_fops (struct file_operations *fops);extern struct tty_struct *alloc_tty_struct (void ); -extern void tty_add_file (struct tty_struct *tty,struct file *file); +extern int tty_add_file (struct tty_struct *tty,struct file *file);extern void free_tty_struct (struct tty_struct *tty);extern void initialize_tty_struct (struct tty_struct *tty,struct tty_driver *driver,int idx);
Signature · 1 line
1.7.2
PATCH 8/49 ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts cris to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485, kept in arch-specific portion
- CRIS defines a different value for TIOCSRS485, kept via ifndef in generic
- The generic version adds support for termiox
--- arch/cris/include/asm/ioctls.h | 84 +--------------------------------------- include/asm-generic/ioctls.h | 2 + 2 files changed, 3 insertions(+), 83 deletions(-)
arch/cris/include/asm/ioctls.h +1 -83
@@ -1,93 +1,11 @@#ifndef __ARCH_CRIS_IOCTLS_H__#define __ARCH_CRIS_IOCTLS_H__ -/* verbatim copy of asm-i386/ioctls.h */ - -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 -#define TIOCSERSETRS485 0x5461/* enable rs-485 (deprecated) */ #define TIOCSERWRRS485 0x5462/* write rs-485 */ #define TIOCSRS485 0x5463/* enable rs-485 */ -#define TIOCGRS485 0x542E/* get rs-485 */ - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif
include/asm-generic/ioctls.h +2 -0
@@ -62,7 +62,9 @@#define TCSETSW2 _IOW('T', 0x2C, struct termios2)#define TCSETSF2 _IOW('T', 0x2D, struct termios2)#define TIOCGRS485 0x542E +#ifndef TIOCSRS485 #define TIOCSRS485 0x542F +#endif #define TIOCGPTN _IOR('T', 0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T', 0x31, int)/* Lock/unlock Pty */ #define TCGETX 0x5432/* SYS5 TCGETX compatibility */
Signature · 1 line
1.7.2
PATCH 11/49 ioctl: Use asm-generic/ioctls.h on ia64 (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts ia64 to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- The generic version adds TIOCSRS485 and TIOCGRS485, which are unused by any driver available on this architecture.
- The generic version adds support for termiox
--- arch/ia64/include/asm/ioctls.h | 89 +--------------------------------------- 1 files changed, 1 insertions(+), 88 deletions(-)
arch/ia64/include/asm/ioctls.h +1 -88
@@ -1,93 +1,6 @@#ifndef _ASM_IA64_IOCTLS_H#define _ASM_IA64_IOCTLS_H -/* -* Based on <asm-i386/ioctls.h> -* -* Modified 1998, 1999, 2002 -* David Mosberger-Tang <[email protected]>, Hewlett-Packard Co -*/ - -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402/* Clashes with SNDCTL_TMR_START sound ioctl */ -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* _ASM_IA64_IOCTLS_H */
Signature · 1 line
1.7.2
PATCH 10/49 ioctl: Use asm-generic/ioctls.h on h8300 (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts h8300 to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- H8300 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCSRS485 and TIOGSRS485, but are unused by any driver available on this architecture.
- The generic version adds support for termiox
--- arch/h8300/include/asm/ioctls.h | 81 +-------------------------------------- 1 files changed, 1 insertions(+), 80 deletions(-)
arch/h8300/include/asm/ioctls.h +1 -80
@@ -1,87 +1,8 @@#ifndef __ARCH_H8300_IOCTLS_H__#define __ARCH_H8300_IOCTLS_H__ -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCTTYGSTRUCT 0x5426/* For debugging only */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* __ARCH_H8300_IOCTLS_H__ */
Signature · 1 line
1.7.2
PATCH 9/49 ioctl: Use asm-generic/ioctls.h on frv (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts frv to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- FRV defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- FRV defines TIOCTTYGSTRUCT, kept in arch-specific version
- The generic version provides TIOCGRS485 and TIOCSRS485 but they are unused by any driver available for this architecture.
- The generic version adds support for termiox
--- arch/frv/include/asm/ioctls.h | 80 +---------------------------------------- 1 files changed, 1 insertions(+), 79 deletions(-)
arch/frv/include/asm/ioctls.h +1 -79
@@ -1,88 +1,10 @@#ifndef __ASM_IOCTLS_H__#define __ASM_IOCTLS_H__ -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ #define TIOCTTYGSTRUCT 0x5426/* For debugging only */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* __ASM_IOCTLS_H__ */
Signature · 1 line
1.7.2
PATCH 17/49 serial-core: restore termios settings when resume console ports
In reply to Greg KHFrom: Jason Wang <[email protected]>
The commit 4547be7 rewrites suspend and resume functions. According to this rewrite, when a serial port is a printk console device and can suspend(without set no_console_suspend flag), it will definitely call set_termios function during its resume, but parameter termios isn't initialized, this will pass an unpredictable config to the serial port. If this serial port is not a userspace opened tty device , a suspend and resume action will make this serial port unusable. I.E. ttyS0 is a printk console device, ttyS1 or keyboard+display is userspace tty device, a suspend/resume action will make ttyS0 unusable.
If a serial port is both a printk console device and an opened tty device, this issue can be overcome because it will call set_termios again with the correct parameter in the uart_change_speed function.
Refer to the deleted content of commit 4547be7, revert parts relate to restore settings into parameter termios. It is safe because if a serial port is a printk console only device, the only meaningful field in termios is c_cflag and its old config is saved in uport->cons->cflag, if this port is also an opened tty device, it will clear uport->cons->cflag in the uart_open and the old config is saved in tty->termios.
--- drivers/serial/serial_core.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/serial/serial_core.c +12 -0
@@ -2066,6 +2066,18 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)* Re-enable the console device after suspending. */ if (console_suspend_enabled &&uart_console (uport)) { +/* +* 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 (port->tty && port->tty->termios && termios.c_cflag ==0 ) + termios = *(port->tty->termios); +uart_change_pm (state,0 ); uport->ops->set_termios (uport, &termios,NULL );console_start (uport->cons);
Signature · 1 line
1.7.2
PATCH 18/49 add ttyprintk driver
In reply to Greg KHFrom: Samo Pogacnik <[email protected]>
Ttyprintk is a pseudo TTY driver, which allows users to make printk messages, via output to ttyprintk device. It is possible to store "console" messages inline with kernel messages for better analyses of the boot process, for example.
--- Documentation/devices.txt | 1 + drivers/char/Kconfig | 15 +++ drivers/char/Makefile | 1 + drivers/char/ttyprintk.c | 225 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 242 insertions(+), 0 deletions(-) create mode 100644 drivers/char/ttyprintk.c
Documentation/devices.txt +1 -0
@@ -239,6 +239,7 @@ Your cooperation is appreciated. 0 = /dev/tty Current TTY device 1 = /dev/console System console 2 = /dev/ptmx PTY master multiplex + 3 = /dev/ttyprintk User messages via printk TTY device 64 = /dev/cua0 Callout device for ttyS0 ... 255 = /dev/cua191 Callout device for ttyS191
drivers/char/Kconfig +15 -0
@@ -493,6 +493,21 @@ config LEGACY_PTY_COUNT When not in use, each legacy PTY occupies 12 bytes on 32-bit architectures and 24 bytes on 64-bit architectures. +config TTY_PRINTK + bool "TTY driver to output user messages via printk" + depends on EMBEDDED + default n + ---help--- + If you say Y here, the support for writing user messages (i.e. + console messages) via printk is available. + + The feature is useful to inline user messages with kernel + messages. + In order to use this feature, you should output user messages + to /dev/ttyprintk or redirect console to this TTY. + + If unsure, say N. + config BRIQ_PANEL tristate 'Total Impact briQ front panel driver' depends on PPC_CHRP
drivers/char/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o t obj-y += tty_mutex.o obj-$(CONFIG_LEGACY_PTYS) += pty.o obj-$(CONFIG_UNIX98_PTYS) += pty.o +obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
drivers/char/ttyprintk.c new file +225 -0
225 lines not on this page · raw message
Signature · 1 line
1.7.2
PATCH 21/49 serial: mrst_max3110: some code cleanup
In reply to Greg KHFrom: Feng Tang <[email protected]>
The cleanup for mrst_max3110 includes:
* remove unneeded head files
* make the spi_transfer dma safe, so that driver is more portable
* add more check for error return value
* use mutex_trylock for read thread
--- drivers/serial/mrst_max3110.c | 327 +++++++++++++++++++++++++---------------- drivers/serial/mrst_max3110.h | 1 + 2 files changed, 201 insertions(+), 127 deletions(-)
drivers/serial/mrst_max3110.c +200 -127
@@ -1,7 +1,7 @@/* -* max3110.c - spi uart protocol driver for Maxim 3110 on Moorestown +* mrst_max3110.c - spi uart protocol driver for Maxim 3110 * -* Copyright (C) Intel 2008 Feng Tang <[email protected]> +* Copyright (c) 2008-2010, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -32,18 +32,13 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/console.h> -#include <linux/sysrq.h> -#include <linux/platform_device.h> #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial_core.h> #include <linux/serial_reg.h> #include <linux/kthread.h> -#include <linux/delay.h> -#include <asm/atomic.h> #include <linux/spi/spi.h> -#include <linux/spi/dw_spi.h> #include "mrst_max3110.h"
@@ -56,7 +51,7 @@struct uart_max3110 {struct uart_port port;struct spi_device *spi; -char *name; +char name[24 ];wait_queue_head_t wq;struct task_struct *main_thread;
@@ -67,35 +62,30 @@ struct uart_max3110 {u16 cur_conf;u8 clock;u8 parity, word_7bits; +u16 irq;unsigned long uart_flags;/* console related */ struct circ_buf con_xmit; - -/* irq related */ -u16 irq; };/* global data structure, may need be removed */ -struct uart_max3110 *pmax; -static inline void receive_char (struct uart_max3110 *max,u8 ch); +static struct uart_max3110 *pmax; +static void receive_chars (struct uart_max3110 *max,unsigned char *str,int len); -static int max3110_read_multi (struct uart_max3110 *max,int len,u8 *buf); -static void max3110_console_receive (struct uart_max3110 *max); +static int max3110_read_multi (struct uart_max3110 *max,u8 *buf); +static void max3110_con_receive (struct uart_max3110 *max); -int max3110_write_then_read (struct uart_max3110 *max, -const u8 *txbuf,u8 *rxbuf,unsigned len,int always_fast) +static int max3110_write_then_read (struct uart_max3110 *max, +const void *txbuf,void *rxbuf,unsigned len,int always_fast) {struct spi_device *spi = max->spi;struct spi_message message;struct spi_transfer x;int ret; -if (!txbuf || !rxbuf) -return -EINVAL ; -spi_message_init (&message);memset (&x,0 ,sizeof x); x.len = len;
@@ -104,7 +94,7 @@ int max3110_write_then_read(struct uart_max3110 *max,spi_message_add_tail (&x, &message);if (always_fast) - x.speed_hz =3125000 ; + x.speed_hz = spi->max_speed_hz;else if (max->baud) x.speed_hz = max->baud;
@@ -113,58 +103,80 @@ int max3110_write_then_read(struct uart_max3110 *max,return ret; } -/* Write a u16 to the device, and return one u16 read back */ -int max3110_out (struct uart_max3110 *max,const u16 out) +/* Write a 16b word to the device */ +static int max3110_out (struct uart_max3110 *max,const u16 out) { -u16 tmp; +void *buf; +u16 *obuf, *ibuf; +u8 ch;int ret; - ret =max3110_write_then_read (max, (u8 *)&out, (u8 *)&tmp,2 ,1 ); -if (ret) -return ret; + buf =kzalloc (8 ,GFP_KERNEL |GFP_DMA ); +if (!buf) +return -ENOMEM ; + + obuf = buf; + ibuf = buf +4 ; + *obuf = out; + ret =max3110_write_then_read (max, obuf, ibuf,2 ,1 ); +if (ret) { +pr_warning (PR_FMT "%s(): get err msg %d when sending 0x%x\n" , + __func__, ret, out); + goto exit; + }/* If some valid data is read back */ -if (tmp &MAX3110_READ_DATA_AVAILABLE ) -receive_char (max, (tmp &0xff )); +if (*ibuf &MAX3110_READ_DATA_AVAILABLE ) { + ch = *ibuf &0xff ; +receive_chars (max, &ch,1 ); + } +exit: +kfree (buf);return ret; } -#define MAX_READ_LEN 20/* * This is usually used to read data from SPIC RX FIFO, which doesn't -* need any delay like flushing character out. It returns how many -* valide bytes are read back +* need any delay like flushing character out. +* +* Return how many valide bytes are read back */ -static int max3110_read_multi (struct uart_max3110 *max,int len,u8 *buf) +static int max3110_read_multi (struct uart_max3110 *max,u8 *rxbuf) { -u16 out[MAX_READ_LEN ], in[MAX_READ_LEN ]; -u8 *pbuf, valid_str[MAX_READ_LEN ]; -int i, j, bytelen; +void *buf; +u16 *obuf, *ibuf; +u8 *pbuf, valid_str[M3110_RX_FIFO_DEPTH ]; +int i, j, blen; -if (len >MAX_READ_LEN ) { -pr_err (PR_FMT "read len %d is too large\n" , len); + blen =M3110_RX_FIFO_DEPTH *sizeof (u16); + buf =kzalloc (blen *2 ,GFP_KERNEL |GFP_DMA ); +if (!buf) { +pr_warning (PR_FMT "%s(): fail to alloc dma buffer\n" , __func__);return 0 ; } - bytelen = len *2 ; -memset (out,0 , bytelen); -memset (in,0 , bytelen); +/* tx/rx always have the same length */ + obuf = buf; + ibuf = buf + blen; -if (max3110_write_then_read (max, (u8 *)out, (u8 *)in, bytelen,1 )) +if (max3110_write_then_read (max, obuf, ibuf, blen,1 )) { +kfree (buf);return 0 ; + } -/* If caller don't provide a buffer, then handle received char */ - pbuf = buf ? buf : valid_str; +/* If caller doesn't provide a buffer, then handle received char */ + pbuf = rxbuf ? rxbuf : valid_str; -for (i =0 , j =0 ; i < len; i++) { -if (in[i] &MAX3110_READ_DATA_AVAILABLE ) - pbuf[j++] = (u8)(in[i] &0xff ); +for (i =0 , j =0 ; i <M3110_RX_FIFO_DEPTH ; i++) { +if (ibuf[i] &MAX3110_READ_DATA_AVAILABLE ) + pbuf[j++] = ibuf[i] &0xff ; }if (j && (pbuf == valid_str))receive_chars (max, valid_str, j); +kfree (buf);return j; }
@@ -178,10 +190,6 @@ static void serial_m3110_con_putchar(struct uart_port *port, int ch) xmit->buf[xmit->head] = (char )ch; xmit->head = (xmit->head +1 ) & (PAGE_SIZE -1 ); } - - -if (!test_and_set_bit (CON_TX_NEEDED , &max->uart_flags)) -wake_up_process (max->main_thread); }/*
@@ -197,6 +205,9 @@ static void serial_m3110_con_write(struct console *co,return ;uart_console_write (&pmax->port, s, count, serial_m3110_con_putchar); + +if (!test_and_set_bit (CON_TX_NEEDED , &pmax->uart_flags)) +wake_up_process (pmax->main_thread); } static int __init
@@ -210,6 +221,9 @@ serial_m3110_con_setup(struct console *co, char *options)pr_info (PR_FMT "setting up console\n" ); +if (co->index ==-1 ) + co->index =0 ; +if (!max) {pr_err (PR_FMT "pmax is NULL, return" );return -ENODEV ;
@@ -240,8 +254,6 @@ static struct console serial_m3110_console = { .data = &serial_m3110_reg, }; -#define MRST_CONSOLE (&serial_m3110_console) -static unsigned int serial_m3110_tx_empty (struct uart_port *port) {return 1 ;
@@ -259,32 +271,44 @@ static void serial_m3110_stop_rx(struct uart_port *port) }#define WORDS_PER_XFER 128 -static inline void send_circ_buf (struct uart_max3110 *max, +static void send_circ_buf (struct uart_max3110 *max,struct circ_buf *xmit) { -int len, left =0 ; -u16 obuf[WORDS_PER_XFER ], ibuf[WORDS_PER_XFER ]; +void *buf; +u16 *obuf, *ibuf;u8 valid_str[WORDS_PER_XFER ]; -int i, j; +int i, j, len, blen, dma_size, left, ret =0 ; + + + dma_size =WORDS_PER_XFER *sizeof (u16) *2 ; + buf =kzalloc (dma_size,GFP_KERNEL |GFP_DMA ); +if (!buf) +return ; + obuf = buf; + ibuf = buf + dma_size/2 ;while (!uart_circ_empty (xmit)) { left =uart_circ_chars_pending (xmit);while (left) { - len = (left >=WORDS_PER_XFER ) ?WORDS_PER_XFER : left; + len =min (left,WORDS_PER_XFER ); + blen = len *sizeof (u16); +memset (ibuf,0 , blen); -memset (obuf,0 , len *2 ); -memset (ibuf,0 , len *2 );for (i =0 ; i < len; i++) { obuf[i] = (u8 )xmit->buf[xmit->tail] |WD_TAG ; xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); } -max3110_write_then_read (max, (u8 *)obuf, - (u8 *)ibuf, len *2 ,0 ); + +/* Fail to send msg to console is not very critical */ + ret =max3110_write_then_read (max, obuf, ibuf, blen,0 ); +if (ret) +pr_warning (PR_FMT "%s(): get err msg %d\n" , + __func__, ret);for (i =0 , j =0 ; i < len; i++) {if (ibuf[i] &MAX3110_READ_DATA_AVAILABLE ) - valid_str[j++] = (u8)(ibuf[i] &0xff ); + valid_str[j++] = ibuf[i] &0xff ; }if (j)
@@ -294,6 +318,8 @@ static inline void send_circ_buf(struct uart_max3110 *max, left -= len; } } + +kfree (buf); }static void transmit_char (struct uart_max3110 *max)
@@ -313,8 +339,10 @@ static void transmit_char(struct uart_max3110 *max)serial_m3110_stop_tx (port); } -/* This will be called by uart_write() and tty_write, can't -* go to sleep */ +/* +* This will be called by uart_write() and tty_write, can't +* go to sleep +*/ static void serial_m3110_start_tx (struct uart_port *port) { struct uart_max3110 *max =
@@ -336,7 +364,7 @@ static void receive_chars(struct uart_max3110 *max, unsigned char *str, int len) tty = port->state->port.tty;if (!tty) -return ;/* receive some char before the tty is opened */ +return ;while (len) { usable =tty_buffer_request_room (tty, len);
@@ -344,32 +372,37 @@ static void receive_chars(struct uart_max3110 *max, unsigned char *str, int len)tty_insert_flip_string (tty, str, usable); str += usable; port->icount.rx += usable; -tty_flip_buffer_push (tty); } len -= usable; } +tty_flip_buffer_push (tty); } -static inline void receive_char (struct uart_max3110 *max,u8 ch) -{ -receive_chars (max, &ch,1 ); -} - -static void max3110_console_receive (struct uart_max3110 *max) +/* +* This routine will be used in read_thread or RX IRQ handling, +* it will first do one round buffer read(8 words), if there is some +* valid RX data, will try to read 5 more rounds till all data +* is read out. +* +* Use stack space as data buffer to save some system load, and chose +* 504 Btyes as a threadhold to do a bulk push to upper tty layer when +* receiving bulk data, a much bigger buffer may cause stack overflow +*/ +static void max3110_con_receive (struct uart_max3110 *max) {int loop =1 , num, total =0 ;u8 recv_buf[512 ], *pbuf; pbuf = recv_buf; do { - num = max3110_read_multi(max, 8, pbuf); + num = max3110_read_multi(max, pbuf); if (num) { - loop = 10; + loop = 5; pbuf += num; total += num; - if (total >= 500) { + if (total >= 504) { receive_chars(max, recv_buf, total); pbuf = recv_buf; total = 0;
@@ -397,7 +430,7 @@ static int max3110_main_thread(void *_max)mutex_lock (&max->thread_mutex);if (test_and_clear_bit (BIT_IRQ_PENDING , &max->uart_flags)) -max3110_console_receive (max); +max3110_con_receive (max);/* first handle console output */ if (test_and_clear_bit (CON_TX_NEEDED , &max->uart_flags))
@@ -434,9 +467,14 @@ static int max3110_read_thread(void *_max)pr_info (PR_FMT "start read thread\n" ); do { - mutex_lock(&max->thread_mutex); - max3110_console_receive(max); - mutex_unlock(&max->thread_mutex); + /* + * If can't acquire the mutex, it means the main thread + * is running which will also perform the rx job + */ + if (mutex_trylock(&max->thread_mutex)) { + max3110_con_receive(max); + mutex_unlock(&max->thread_mutex); + } set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ / 20);
@@ -453,15 +491,16 @@ static int serial_m3110_startup(struct uart_port *port)u16 config =0 ;int ret =0 ; -if (port->line !=0 ) +if (port->line !=0 ) {pr_err (PR_FMT "uart port startup failed\n" ); +return -1 ; + } -/* firstly disable all IRQ and config it to 115200, 8n1 */ +/* Disable all IRQ and config it to 115200, 8n1 */ config =WC_TAG |WC_FIFO_ENABLE |WC_1_STOPBITS |WC_8BIT_WORD |WC_BAUD_DR2 ; - ret =max3110_out (max, config);/* as we use thread to handle tx/rx, need set low latency */ port->state->port.tty->low_latency =1 ;
@@ -472,14 +511,30 @@ static int serial_m3110_startup(struct uart_port *port)if (ret)return ret; -/* enable RX IRQ only */ +/* Enable RX IRQ only */ config |=WC_RXA_IRQ_ENABLE ; -max3110_out (max, config);#else -/* if IRQ is disabled, start a read thread for input data */ +/* If IRQ is disabled, start a read thread for input data */ max->read_thread =kthread_run (max3110_read_thread, max,"max3110_read" ); +if (IS_ERR (max->read_thread)) { + ret =PTR_ERR (max->read_thread); + max->read_thread =NULL ; +pr_err (PR_FMT "Can't create read thread!" ); +return ret; + } +#endif + + ret =max3110_out (max, config); +if (ret) { +#ifdef CONFIG_MRST_MAX3110_IRQ +free_irq (max->irq, max); +#else +kthread_stop (max->read_thread); + max->read_thread =NULL ;#endif +return ret; + } max->cur_conf = config;return 0 ;
@@ -516,8 +571,7 @@ static int serial_m3110_request_port(struct uart_port *port)static void serial_m3110_config_port (struct uart_port *port,int flags) { -/* give it fake type */ - port->type =PORT_PXA ; + port->type =PORT_MAX3100 ; } static int
@@ -552,6 +606,9 @@ serial_m3110_set_termios(struct uart_port *port, struct ktermios *termios, new_conf |=WC_7BIT_WORD ;break ;default : +/* We only support CS7 & CS8 */ + termios->c_cflag &= ~CSIZE ; + termios->c_cflag |=CS8 ;case CS8 : cval =UART_LCR_WLEN8 ; new_conf |=WC_8BIT_WORD ;
@@ -560,7 +617,7 @@ serial_m3110_set_termios(struct uart_port *port, struct ktermios *termios, baud =uart_get_baud_rate (port, termios, old,0 ,230400 ); -/* first calc the div for 1.8MHZ clock case */ +/* First calc the div for 1.8MHZ clock case */ switch (baud) {case 300 : clk_div =WC_BAUD_DR384 ;
@@ -596,7 +653,7 @@ serial_m3110_set_termios(struct uart_port *port, struct ktermios *termios,if (max->clock &MAX3110_HIGH_CLK )break ;default : -/* pick the previous baud rate */ +/* Pick the previous baud rate */ baud = max->baud; clk_div = max->cur_conf &WC_BAUD_DIV_MASK ;tty_termios_encode_baud_rate (termios, baud, baud);
@@ -604,15 +661,21 @@ serial_m3110_set_termios(struct uart_port *port, struct ktermios *termios,if (max->clock &MAX3110_HIGH_CLK ) { clk_div +=1 ; -/* high clk version max3110 doesn't support B300 */ -if (baud ==300 ) +/* High clk version max3110 doesn't support B300 */ +if (baud ==300 ) { baud =600 ; + clk_div =WC_BAUD_DR384 ; + }if (baud ==230400 ) clk_div =WC_BAUD_DR1 ;tty_termios_encode_baud_rate (termios, baud, baud); } new_conf = (new_conf & ~WC_BAUD_DIV_MASK ) | clk_div; + +if (unlikely (termios->c_cflag &CMSPAR )) + termios->c_cflag &= ~CMSPAR ; +if (termios->c_cflag &CSTOPB ) new_conf |=WC_2_STOPBITS ;else
@@ -632,13 +695,14 @@ serial_m3110_set_termios(struct uart_port *port, struct ktermios *termios, new_conf |=WC_TAG ;if (new_conf != max->cur_conf) { -max3110_out (max, new_conf); - max->cur_conf = new_conf; - max->baud = baud; +if (!max3110_out (max, new_conf)) { + max->cur_conf = new_conf; + max->baud = baud; + } } } -/* don't handle hw handshaking */ +/* Don't handle hw handshaking */ static unsigned int serial_m3110_get_mctrl (struct uart_port *port) {return TIOCM_DSR |TIOCM_CAR |TIOCM_DSR ;
@@ -672,7 +736,7 @@ struct uart_ops serial_m3110_ops = { .break_ctl = serial_m3110_break_ctl, .startup = serial_m3110_startup, .shutdown = serial_m3110_shutdown, - .set_termios = serial_m3110_set_termios, /* must have */ + .set_termios = serial_m3110_set_termios, .pm = serial_m3110_pm, .type = serial_m3110_type, .release_port = serial_m3110_release_port,
@@ -688,52 +752,60 @@ static struct uart_driver serial_m3110_reg = { .major = TTY_MAJOR, .minor = 64, .nr = 1, - .cons = MRST_CONSOLE, + .cons = &serial_m3110_console, }; +#ifdef CONFIG_PM static int serial_m3110_suspend (struct spi_device *spi,pm_message_t state) { +struct uart_max3110 *max =spi_get_drvdata (spi); + +disable_irq (max->irq); +uart_suspend_port (&serial_m3110_reg, &max->port); +max3110_out (max, max->cur_conf |WC_SW_SHDI );return 0 ; }static int serial_m3110_resume (struct spi_device *spi) { +struct uart_max3110 *max =spi_get_drvdata (spi); + +max3110_out (max, max->cur_conf); +uart_resume_port (&serial_m3110_reg, &max->port); +enable_irq (max->irq);return 0 ; } +#else +#define serial_m3110_suspend NULL +#define serial_m3110_resume NULL +#endif -static struct dw_spi_chip spi0_uart = { - .poll_mode =1 , - .enable_dma =0 , - .type =SPI_FRF_SPI , -}; - -static int serial_m3110_probe (struct spi_device *spi) +static int __devinit serial_m3110_probe (struct spi_device *spi) {struct uart_max3110 *max; -int ret; -unsigned char *buffer; +void *buffer;u16 res; +int ret =0 ; + max =kzalloc (sizeof (*max),GFP_KERNEL );if (!max)return -ENOMEM ; -/* set spi info */ - spi->mode =SPI_MODE_0 ; +/* Set spi info */ spi->bits_per_word =16 ; max->clock =MAX3110_HIGH_CLK ; - spi->controller_data = &spi0_uart;spi_setup (spi); - max->port.type =PORT_PXA ;/* need apply for a max3110 type */ - max->port.fifosize =2 ;/* only have 16b buffer */ + max->port.type =PORT_MAX3100 ; + max->port.fifosize =2 ;/* Only have 16b buffer */ max->port.ops = &serial_m3110_ops; max->port.line =0 ; max->port.dev = &spi->dev; max->port.uartclk =115200 ; max->spi = spi; - max->name = spi->modalias;/* use spi name as the name */ +strcpy (max->name, spi->modalias); max->irq = (u16 )spi->irq;mutex_init (&max->thread_mutex);
@@ -755,13 +827,15 @@ static int serial_m3110_probe(struct spi_device *spi) ret = -ENODEV ; goto err_get_page; } - buffer = (unsigned char *)__get_free_page (GFP_KERNEL ); + + buffer = (void *)__get_free_page (GFP_KERNEL );if (!buffer) { ret = -ENOMEM ; goto err_get_page; } - max->con_xmit.buf = (unsigned char *)buffer; - max->con_xmit.head = max->con_xmit.tail =0 ; + max->con_xmit.buf = buffer; + max->con_xmit.head =0 ; + max->con_xmit.tail =0 ; max->main_thread =kthread_run (max3110_main_thread, max,"max3110_main" );
@@ -770,8 +844,10 @@ static int serial_m3110_probe(struct spi_device *spi) goto err_kthread; } +spi_set_drvdata (spi, max); pmax = max; -/* give membase a psudo value to pass serial_core's check */ + +/* Give membase a psudo value to pass serial_core's check */ max->port.membase = (void *)0xff110000 ;uart_add_one_port (&serial_m3110_reg, &max->port);
@@ -780,19 +856,17 @@ static int serial_m3110_probe(struct spi_device *spi) err_kthread:free_page ((unsigned long )buffer); err_get_page: - pmax =NULL ;kfree (max);return ret; } -static int max3110_remove (struct spi_device *dev) +static int __devexit serial_m3110_remove(struct spi_device *dev) { -struct uart_max3110 *max = pmax; +struct uart_max3110 *max =spi_get_drvdata (dev); -if (!pmax) +if (!max)return 0 ; - pmax =NULL ;uart_remove_one_port (&serial_m3110_reg, &max->port);free_page ((unsigned long )max->con_xmit.buf);
@@ -811,13 +885,12 @@ static struct spi_driver uart_max3110_driver = { .owner = THIS_MODULE, }, .probe = serial_m3110_probe, - .remove = __devexit_p(max3110_remove), + .remove = __devexit_p(serial_m3110_remove), .suspend = serial_m3110_suspend, .resume = serial_m3110_resume, }; - -int __init serial_m3110_init (void ) +static int __init serial_m3110_init (void ) {int ret =0 ;
@@ -832,7 +905,7 @@ int __init serial_m3110_init(void)return ret; } -void __exit serial_m3110_exit(void) +static void __exit serial_m3110_exit(void) {spi_unregister_driver (&uart_max3110_driver);uart_unregister_driver (&serial_m3110_reg);
@@ -841,5 +914,5 @@ void __exit serial_m3110_exit(void)module_init (serial_m3110_init);module_exit (serial_m3110_exit); -MODULE_LICENSE ("GPL" ); +MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("max3110-uart" );
drivers/serial/mrst_max3110.h +1 -0
@@ -56,4 +56,5 @@#define WC_BAUD_DR192 (0xE)#define WC_BAUD_DR384 (0xF) +#define M3110_RX_FIFO_DEPTH 8#endif
Signature · 1 line
1.7.2
PATCH 23/49 serial: max3107: Fix memory leaks when returning on error
In reply to Greg KHFrom: Davidlohr Bueso <[email protected]>
Fix memory leaks in max3107_probe() when returning on error.
--- drivers/serial/max3107.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-)
drivers/serial/max3107.c +25 -9
@@ -986,12 +986,14 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) s->rxbuf =kzalloc (sizeof (u16) * (MAX3107_RX_FIFO_SIZE +2 ),GFP_KERNEL );if (!s->rxbuf) {pr_err ("Allocating RX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free4; } s->rxstr =kzalloc (sizeof (u8) *MAX3107_RX_FIFO_SIZE ,GFP_KERNEL );if (!s->rxstr) {pr_err ("Allocating RX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free3; }/* SPI Tx buffer * SPI transfer buffer
@@ -1002,7 +1004,8 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) s->txbuf =kzalloc (sizeof (u16) *MAX3107_TX_FIFO_SIZE +3 ,GFP_KERNEL );if (!s->txbuf) {pr_err ("Allocating TX buffer failed\n" ); -return -ENOMEM ; + retval = -ENOMEM ; + goto err_free2; }/* Initialize shared data lock */ spin_lock_init (&s->data_lock);
@@ -1021,13 +1024,15 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) buf[0 ] =MAX3107_REVID_REG ;if (max3107_rw (s, (u8 *)buf, (u8 *)buf,2 )) {dev_err (&s->spi->dev,"SPI transfer for REVID read failed\n" ); -return -EIO ; + retval = -EIO ; + goto err_free1; }if ((buf[0 ] &MAX3107_SPI_RX_DATA_MASK ) !=MAX3107_REVID1 && (buf[0 ] &MAX3107_SPI_RX_DATA_MASK ) !=MAX3107_REVID2 ) {dev_err (&s->spi->dev,"REVID %x does not match\n" , (buf[0 ] &MAX3107_SPI_RX_DATA_MASK )); -return -ENODEV ; + retval = -ENODEV ; + goto err_free1; }/* Disable all interrupts */
@@ -1047,7 +1052,8 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata)/* Perform SPI transfer */ if (max3107_rw (s, (u8 *)buf,NULL ,4 )) {dev_err (&s->spi->dev,"SPI transfer for init failed\n" ); -return -EIO ; + retval = -EIO ; + goto err_free1; }/* Register UART driver */
@@ -1055,7 +1061,7 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) retval =uart_register_driver (&max3107_uart_driver);if (retval) {dev_err (&s->spi->dev,"Registering UART driver failed\n" ); -return retval; + goto err_free1; } driver_registered =1 ; }
@@ -1074,13 +1080,13 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) retval =uart_add_one_port (&max3107_uart_driver, &s->port);if (retval <0 ) {dev_err (&s->spi->dev,"Adding UART port failed\n" ); -return retval; + goto err_free1; }if (pdata->configure) { retval = pdata->configure (s);if (retval <0 ) -return retval; + goto err_free1; }/* Go to suspend mode */
@@ -1088,6 +1094,16 @@ int max3107_probe(struct spi_device *spi, struct max3107_plat *pdata) pdata->hw_suspend (s,1 );return 0 ; + +err_free1: +kfree (s->txbuf); +err_free2: +kfree (s->rxstr); +err_free3: +kfree (s->rxbuf); +err_free4: +kfree (s); +return retval; }EXPORT_SYMBOL_GPL (max3107_probe);
Signature · 1 line
1.7.2
PATCH 24/49 tty: Make tiocgicount a handler
In reply to Greg KHFrom: Alan Cox <[email protected]>
Dan Rosenberg noted that various drivers return the struct with uncleared fields. Instead of spending forever trying to stomp all the drivers that get it wrong (and every new driver) do the job in one place.
This first patch adds the needed operations and hooks them up, including the needed USB midlayer and serial core plumbing.
--- drivers/char/tty_io.c | 21 +++++++++++++++++++++ drivers/serial/serial_core.c | 37 +++++++++++++++++-------------------- drivers/usb/serial/usb-serial.c | 13 +++++++++++++ include/linux/tty_driver.h | 9 +++++++++ include/linux/usb/serial.h | 2 ++ 5 files changed, 62 insertions(+), 20 deletions(-)
drivers/char/tty_io.c +21 -0
@@ -96,6 +96,7 @@#include <linux/bitops.h> #include <linux/delay.h> #include <linux/seq_file.h> +#include <linux/serial.h> #include <linux/uaccess.h> #include <asm/system.h>
@@ -2511,6 +2512,20 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned intreturn tty->ops->tiocmset (tty, file, set, clear); } +static int tty_tiocgicount (struct tty_struct *tty,void __user *arg) +{ +int retval = -EINVAL ; +struct serial_icounter_struct icount; +memset (&icount,0 ,sizeof (icount)); +if (tty->ops->get_icount) + retval = tty->ops->get_icount (tty, &icount); +if (retval !=0 ) +return retval; +if (copy_to_user (arg, &icount,sizeof (icount))) +return -EFAULT ; +return 0 ; +} +struct tty_struct *tty_pair_get_tty (struct tty_struct *tty) { if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
@@ -2631,6 +2646,12 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case TIOCMBIC :case TIOCMBIS :return tty_tiocmset (tty, file, cmd, p); +case TIOCGICOUNT : + retval =tty_tiocgicount (tty, p); +/* For the moment allow fall through to the old method */ +if (retval != -EINVAL ) +return retval; +break ;case TCFLSH :switch (arg) {case TCIFLUSH :
drivers/serial/serial_core.c +16 -19
@@ -1074,10 +1074,10 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)* NB: both 1->0 and 0->1 transitions are counted except for * RI where only 0->1 is counted. */ -static int uart_get_count (struct uart_state *state, -struct serial_icounter_struct __user *icnt) +static int uart_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount) { -struct serial_icounter_struct icount; +struct uart_state *state = tty->driver_data;struct uart_icount cnow;struct uart_port *uport = state->uart_port;
@@ -1085,19 +1085,19 @@ static int uart_get_count(struct uart_state *state,memcpy (&cnow, &uport->icount,sizeof (struct uart_icount ));spin_unlock_irq (&uport->lock); - icount.cts = cnow.cts; - icount.dsr = cnow.dsr; - icount.rng = cnow.rng; - icount.dcd = cnow.dcd; - icount.rx = cnow.rx; - icount.tx = cnow.tx; - icount.frame = cnow.frame; - icount.overrun = cnow.overrun; - icount.parity = cnow.parity; - icount.brk = cnow.brk; - icount.buf_overrun = cnow.buf_overrun; + icount->cts = cnow.cts; + icount->dsr = cnow.dsr; + icount->rng = cnow.rng; + icount->dcd = cnow.dcd; + icount->rx = cnow.rx; + icount->tx = cnow.tx; + icount->frame = cnow.frame; + icount->overrun = cnow.overrun; + icount->parity = cnow.parity; + icount->brk = cnow.brk; + icount->buf_overrun = cnow.buf_overrun; -return copy_to_user (icnt, &icount,sizeof (icount)) ? -EFAULT :0 ; +return 0 ; }/*
@@ -1150,10 +1150,6 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,case TIOCMIWAIT : ret =uart_wait_modem_status (state, arg);break ; - -case TIOCGICOUNT : - ret =uart_get_count (state, uarg); -break ; }if (ret != -ENOIOCTLCMD )
@@ -2295,6 +2291,7 @@ static const struct tty_operations uart_ops = {#endif .tiocmget = uart_tiocmget, .tiocmset = uart_tiocmset, + .get_icount = uart_get_icount, #ifdef CONFIG_CONSOLE_POLL .poll_init = uart_poll_init, .poll_get_char = uart_poll_get_char,
drivers/usb/serial/usb-serial.c +13 -0
@@ -519,6 +519,18 @@ static int serial_tiocmset(struct tty_struct *tty, struct file *file,return -EINVAL ; } +static int serial_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount) +{ +struct usb_serial_port *port = tty->driver_data; + +dbg ("%s - port %d" , __func__, port->number); + +if (port->serial->type->get_icount) +return port->serial->type->get_icount (tty, icount); +return -EINVAL ; +} +/* * We would be calling tty_wakeup here, but unfortunately some line * disciplines have an annoying habit of calling tty->write from
@@ -1195,6 +1207,7 @@ static const struct tty_operations serial_ops = { .chars_in_buffer = serial_chars_in_buffer, .tiocmget = serial_tiocmget, .tiocmset = serial_tiocmset, + .get_icount = serial_get_icount, .cleanup = serial_cleanup, .install = serial_install, .proc_fops = &serial_proc_fops,
include/linux/tty_driver.h +9 -0
@@ -224,6 +224,12 @@* unless the tty also has a valid tty->termiox pointer. * * Optional: Called under the termios lock +* +* int (*get_icount)(struct tty_struct *tty, struct serial_icounter *icount); +* +* Called when the device receives a TIOCGICOUNT ioctl. Passed a kernel +* structure to complete. This method is optional and will only be called +* if provided (otherwise EINVAL will be returned). */ #include <linux/fs.h>
@@ -232,6 +238,7 @@struct tty_struct ;struct tty_driver ; +struct serial_icounter_struct ;struct tty_operations { struct tty_struct * (*lookup)(struct tty_driver *driver,
@@ -268,6 +275,8 @@ struct tty_operations { unsigned int set, unsigned int clear);int (*resize)(struct tty_struct *tty,struct winsize *ws);int (*set_termiox)(struct tty_struct *tty,struct termiox *tnew); +int (*get_icount)(struct tty_struct *tty, +struct serial_icounter_struct *icount);#ifdef CONFIG_CONSOLE_POLL int (*poll_init)(struct tty_driver *driver,int line,char *options);int (*poll_get_char)(struct tty_driver *driver,int line);
include/linux/usb/serial.h +2 -0
@@ -271,6 +271,8 @@ struct usb_serial_driver {int (*tiocmget)(struct tty_struct *tty,struct file *file);int (*tiocmset)(struct tty_struct *tty,struct file *file,unsigned int set,unsigned int clear); +int (*get_icount)(struct tty_struct *tty, +struct serial_icounter_struct *icount);/* Called by the tty layer for port level work. There may or may not be an attached tty at this point */ void (*dtr_rts)(struct usb_serial_port *port,int on);
Signature · 1 line
1.7.2
PATCH 26/49 tty: icount changeover for other main devices
In reply to Greg KHFrom: Alan Cox <[email protected]>
Again basically cut and paste
Convert the main driver set to use the hooks for GICOUNT
--- arch/ia64/hp/sim/simserial.c | 12 +------ drivers/char/amiserial.c | 56 ++++++++++++++++------------- drivers/char/cyclades.c | 49 +++++++++++++------------ drivers/char/ip2/ip2main.c | 72 ++++++++++++++++++++++--------------- drivers/char/mxser.c | 62 ++++++++++++++++++-------------- drivers/char/nozomi.c | 37 +++++++++---------- drivers/char/pcmcia/synclink_cs.c | 60 ++++++++++++++----------------- drivers/char/synclink.c | 73 +++++++++++++++++-------------------- drivers/char/synclink_gt.c | 55 +++++++++++++++------------- drivers/char/synclinkmp.c | 61 ++++++++++++++----------------- drivers/serial/68360serial.c | 51 +++++++++++++------------- net/bluetooth/rfcomm/tty.c | 4 -- 12 files changed, 297 insertions(+), 295 deletions(-)
arch/ia64/hp/sim/simserial.c +1 -11
@@ -395,7 +395,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, {if ((cmd !=TIOCGSERIAL ) && (cmd !=TIOCSSERIAL ) && (cmd !=TIOCSERCONFIG ) && (cmd !=TIOCSERGSTRUCT ) && - (cmd !=TIOCMIWAIT ) && (cmd !=TIOCGICOUNT )) { + (cmd !=TIOCMIWAIT )) {if (tty->flags & (1 <<TTY_IO_ERROR ))return -EIO ; }
@@ -433,16 +433,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,case TIOCMIWAIT :printk (KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n" );return 0 ; -/* -* Get counter of input serial line interrupts (DCD,RI,DSR,CTS) -* Return: write counters to the user passed counter struct -* NB: both 1->0 and 0->1 transitions are counted except for -* RI where only 0->1 is counted. -*/ -case TIOCGICOUNT : -printk (KERN_INFO "rs_ioctl: TIOCGICOUNT called\n" ); -return 0 ; -case TIOCSERGWILD :case TIOCSERSWILD :/* "setserial -W" is called in Debian boot */
drivers/char/amiserial.c +31 -25
74 lines not on this page · raw message
drivers/char/cyclades.c +26 -23
67 lines not on this page · raw message
drivers/char/ip2/ip2main.c +43 -29
102 lines not on this page · raw message
drivers/char/mxser.c +35 -27
86 lines not on this page · raw message
drivers/char/nozomi.c +18 -19
@@ -1804,24 +1804,24 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,return ret; } -static int ntty_ioctl_tiocgicount (struct port *port,void __user *argp) +static int ntty_tiocgicount (struct tty_struct *tty, +struct serial_icounter_struct *icount) { +struct port *port = tty->driver_data;const struct async_icount cnow = port->tty_icount; -struct serial_icounter_struct icount; - - icount.cts = cnow.cts; - icount.dsr = cnow.dsr; - icount.rng = cnow.rng; - icount.dcd = cnow.dcd; - icount.rx = cnow.rx; - icount.tx = cnow.tx; - icount.frame = cnow.frame; - icount.overrun = cnow.overrun; - icount.parity = cnow.parity; - icount.brk = cnow.brk; - icount.buf_overrun = cnow.buf_overrun; - -return copy_to_user (argp, &icount,sizeof (icount)) ? -EFAULT :0 ; + + icount->cts = cnow.cts; + icount->dsr = cnow.dsr; + icount->rng = cnow.rng; + icount->dcd = cnow.dcd; + icount->rx = cnow.rx; + icount->tx = cnow.tx; + icount->frame = cnow.frame; + icount->overrun = cnow.overrun; + icount->parity = cnow.parity; + icount->brk = cnow.brk; + icount->buf_overrun = cnow.buf_overrun; +return 0 ; } static int ntty_ioctl(struct tty_struct *tty, struct file *file,
@@ -1840,9 +1840,7 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file, rval =wait_event_interruptible (port->tty_wait,ntty_cflags_changed (port, arg, &cprev));break ; - }case TIOCGICOUNT : - rval =ntty_ioctl_tiocgicount (port, argp); -break ; + }default :DBG1 ("ERR: 0x%08X, %d" , cmd, cmd);break ;
@@ -1922,6 +1920,7 @@ static const struct tty_operations tty_ops = { .chars_in_buffer = ntty_chars_in_buffer, .tiocmget = ntty_tiocmget, .tiocmset = ntty_tiocmset, + .get_icount = ntty_tiocgicount, .install = ntty_install, .cleanup = ntty_cleanup, };
drivers/char/pcmcia/synclink_cs.c +27 -33
85 lines not on this page · raw message
drivers/char/synclink.c +34 -39
104 lines not on this page · raw message
drivers/char/synclink_gt.c +29 -26
91 lines not on this page · raw message
drivers/char/synclinkmp.c +28 -33
91 lines not on this page · raw message
drivers/serial/68360serial.c +25 -26
69 lines not on this page · raw message
net/bluetooth/rfcomm/tty.c +0 -4
@@ -844,10 +844,6 @@ static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsignedBT_DBG ("TIOCMIWAIT" );break ; -case TIOCGICOUNT : -BT_DBG ("TIOCGICOUNT" ); -break ; -case TIOCGSERIAL :BT_ERR ("TIOCGSERIAL is not supported" );return -ENOIOCTLCMD ;
Signature · 1 line
1.7.2
PATCH 28/49 tty: Add a new file /proc/tty/consoles
In reply to Greg KHFrom: Dr. Werner Fink <[email protected]>
Add a new file /proc/tty/consoles to be able to determine the registered system console lines. If the reading process holds /dev/console open at the regular standard input stream the active device will be marked by an asterisk. Show possible operations and also decode the used flags of the listed console lines.
--- Documentation/filesystems/proc.txt | 32 +++++++ fs/proc/proc_tty.c | 158 ++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 0 deletions(-)
Documentation/filesystems/proc.txt +32 -0
@@ -1075,6 +1075,7 @@ Table 1-11: Files in /proc/tty drivers list of drivers and their usage ldiscs registered line disciplines driver/serial usage statistic and status of single tty lines + consoles registered system console lines .............................................................................. To see which tty's are currently in use, you can simply look into the file
@@ -1093,6 +1094,37 @@ To see which tty's are currently in use, you can simply look into the file /dev/tty /dev/tty 5 0 system:/dev/tty unknown /dev/tty 4 1-63 console +To see which character device lines are currently used for the system console +/dev/console, you may simply look into the file /proc/tty/consoles: + + > cat /proc/tty/consoles + tty0 -WU (ECp) 4:7 + ttyS0 -W- (Ep) 4:64 + +The columns are: + + device name of the device + operations R = can do read operations + W = can do write operations + U = can do unblank + flags E = it is enabled + C = it is prefered console + B = it is primary boot console + p = it is used for printk buffer + b = it is not a TTY but a Braille device + a = it is safe to use when cpu is offline + * = it is standard input of the reading process + major:minor major and minor number of the device separated by a colon + +If the reading process holds /dev/console open at the regular standard input +stream the active device will be marked by an asterisk: + + > cat /proc/tty/consoles < /dev/console + tty0 -WU (ECp*) 4:7 + ttyS0 -W- (Ep) 4:64 + > tty + /dev/pts/3 + 1.8 Miscellaneous kernel statistics in /proc/stat -------------------------------------------------
fs/proc/proc_tty.c +158 -0
175 lines not on this page · raw message
Signature · 1 line
1.7.2
PATCH 30/49 vcs: invoke the vt update callback when /dev/vcs* is written to
In reply to Greg KHFrom: Nicolas Pitre <[email protected]>
A notifier chain is called whenever the vt code modifies a terminal content, except for one case which is when the modification comes through writes to /dev/vcs* devices. Let's add the missing notifier invocation at the end of vcs_write() for that case too.
--- drivers/char/vc_screen.c | 2 ++ drivers/char/vt.c | 5 +++++ include/linux/selection.h | 1 + 3 files changed, 8 insertions(+), 0 deletions(-)
drivers/char/vc_screen.c +2 -0
@@ -538,6 +538,8 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) } *ppos += written; ret = written; +if (written) +vcs_scr_updated (vc); unlock_out:release_console_sem ();
drivers/char/vt.c +5 -0
@@ -4182,6 +4182,11 @@ void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org) } } +void vcs_scr_updated (struct vc_data *vc) +{ +notify_update (vc); +} +/* * Visible symbols for modules */
include/linux/selection.h +1 -0
@@ -39,5 +39,6 @@ extern void putconsxy(struct vc_data *vc, unsigned char *p);extern u16 vcs_scr_readw (struct vc_data *vc,const u16 *org);extern void vcs_scr_writew (struct vc_data *vc,u16 val,u16 *org); +extern void vcs_scr_updated (struct vc_data *vc);#endif
Signature · 1 line
1.7.2
PATCH 31/49 tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
In reply to Greg KHFrom: Breno Leitao <[email protected]>
Soott Kilau is handing off the maintainership of the jsm serial driver to me, and this patch just add the driver as maintained.
--- MAINTAINERS | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
MAINTAINERS +6 -0
@@ -3331,6 +3331,12 @@ F: fs/jbd*/ F: include/linux/ext*jbd*.h F: include/linux/jbd*.h +JSM Neo PCI based serial card +M: Breno Leitao <[email protected]> +L: [email protected] +S: Maintained +F: drivers/serial/jsm/ + K8TEMP HARDWARE MONITORING DRIVER M: Rudolf Marek <[email protected]> L: [email protected]
Signature · 1 line
1.7.2
PATCH 32/49 serial: 8250: Don't delay after transmitter is ready.
In reply to Greg KHFrom: David Daney <[email protected]>
The loop in wait_for_xmitr() is delaying one extra uS after the ready condition has been met. Rewrite the loop to only delay if the transmitter is not ready.
--- drivers/serial/8250.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/serial/8250.c +4 -2
@@ -1867,15 +1867,17 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)unsigned int status, tmout =10000 ;/* Wait up to 10ms for the character(s) to be sent. */ -do { +for (;;) { status =serial_in (up,UART_LSR ); up->lsr_saved_flags |= status &LSR_SAVE_FLAGS ; +if ((status & bits) == bits) +break ;if (--tmout ==0 )break ;udelay (1 ); - }while ((status & bits) != bits); + }/* Wait up to 1s for flow control if necessary */ if (up->port.flags &UPF_CONS_FLOW ) {
Signature · 1 line
1.7.2
PATCH 33/49 serial: mark the 8250 driver as maintained
In reply to Greg KHClearly I have gone insane, so I might as well tell the world about it.
--- MAINTAINERS | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
MAINTAINERS +3 -1
@@ -157,9 +157,11 @@ S: Maintained F: drivers/net/r8169.c 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER +M: Greg Kroah-Hartman <[email protected]> L: [email protected] W: http://serial.sourceforge.net -S: Orphan +S: Maintained +T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ F: drivers/serial/8250* F: include/linux/serial_8250.h
Signature · 1 line
1.7.2
PATCH 34/49 serial: Factor out uart_poll_timeout() from 8250 driver
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
Soon we will use that handy function in the altera_uart driver.
--- drivers/serial/8250.c | 14 ++++---------- include/linux/serial_core.h | 8 ++++++++ 2 files changed, 12 insertions(+), 10 deletions(-)
drivers/serial/8250.c +4 -10
@@ -1722,12 +1722,6 @@ static void serial_unlink_irq_chain(struct uart_8250_port *up)mutex_unlock (&hash_mutex); } -/* Base timer interval for polling */ -static inline int poll_timeout (int timeout) -{ -return timeout >6 ? (timeout /2 -2 ) :1 ; -} -/* * This function is used to handle ports that do not have an * interrupt. This doesn't work very well for 16450's, but gives
@@ -1742,7 +1736,7 @@ static void serial8250_timeout(unsigned long data) iir =serial_in (up,UART_IIR );if (!(iir &UART_IIR_NO_INT ))serial8250_handle_port (up); -mod_timer (&up->timer, jiffies +poll_timeout (up->port.timeout)); +mod_timer (&up->timer, jiffies +uart_poll_timeout (&up->port)); }static void serial8250_backup_timeout (unsigned long data)
@@ -1787,7 +1781,7 @@ static void serial8250_backup_timeout(unsigned long data)/* Standard timer interval plus 0.2s to keep the port running */ mod_timer (&up->timer, - jiffies +poll_timeout (up->port.timeout) +HZ /5 ); + jiffies +uart_poll_timeout (&up->port) +HZ /5 ); }static unsigned int serial8250_tx_empty (struct uart_port *port)
@@ -2071,7 +2065,7 @@ static int serial8250_startup(struct uart_port *port) up->timer.function = serial8250_backup_timeout; up->timer.data = (unsigned long )up;mod_timer (&up->timer, jiffies + -poll_timeout (up->port.timeout) +HZ /5 ); +uart_poll_timeout (port) +HZ /5 ); }/*
@@ -2081,7 +2075,7 @@ static int serial8250_startup(struct uart_port *port)*/ if (!is_real_interrupt (up->port.irq)) { up->timer.data = (unsigned long )up; -mod_timer (&up->timer, jiffies +poll_timeout (up->port.timeout)); +mod_timer (&up->timer, jiffies +uart_poll_timeout (port)); }else { retval =serial_link_irq_chain (up);if (retval)
include/linux/serial_core.h +8 -0
@@ -411,6 +411,14 @@ unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios unsigned int max);unsigned int uart_get_divisor (struct uart_port *port,unsigned int baud); +/* Base timer interval for polling */ +static inline int uart_poll_timeout (struct uart_port *port) +{ +int timeout = port->timeout; + +return timeout >6 ? (timeout /2 -2 ) :1 ; +} +/* * Console helpers. */
Signature · 1 line
1.7.2
PATCH 35/49 altera_uart: Add support for polling mode (IRQ-less)
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
Some Altera UART implementations doesn't route the IRQ line, so we have to work in polling mode.
--- drivers/serial/altera_uart.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-)
drivers/serial/altera_uart.c +22 -1
@@ -15,6 +15,7 @@#include <linux/kernel.h> #include <linux/init.h> +#include <linux/timer.h> #include <linux/interrupt.h> #include <linux/module.h> #include <linux/console.h>
@@ -76,6 +77,7 @@*/ struct altera_uart {struct uart_port port; +struct timer_list tmr;unsigned int sigs;/* Local copy of line sigs */ unsigned short imr;/* Local IMR mirror */ };
@@ -168,6 +170,7 @@ static void altera_uart_set_termios(struct uart_port *port,tty_termios_encode_baud_rate (termios, baud, baud);spin_lock_irqsave (&port->lock, flags); +uart_update_timeout (port, termios->c_cflag, baud);writel (baudclk, port->membase +ALTERA_UART_DIVISOR_REG );spin_unlock_irqrestore (&port->lock, flags); }
@@ -268,6 +271,15 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data)return IRQ_RETVAL (isr); } +static void altera_uart_timer (unsigned long data) +{ +struct uart_port *port = (void *)data; + struct altera_uart *pp = container_of(port, struct altera_uart, port); + +altera_uart_interrupt (0 , port); +mod_timer (&pp->tmr, jiffies +uart_poll_timeout (port)); +} +static void altera_uart_config_port (struct uart_port *port,int flags) { port->type =PORT_ALTERA_UART ;
@@ -284,6 +296,12 @@ static int altera_uart_startup(struct uart_port *port)unsigned long flags;int ret; +if (!port->irq) { +setup_timer (&pp->tmr, altera_uart_timer, (unsigned long )port); +mod_timer (&pp->tmr, jiffies +uart_poll_timeout (port)); +return 0 ; + } + ret =request_irq (port->irq, altera_uart_interrupt,IRQF_DISABLED ,DRV_NAME , port);if (ret) {
@@ -316,7 +334,10 @@ static void altera_uart_shutdown(struct uart_port *port)spin_unlock_irqrestore (&port->lock, flags); -free_irq (port->irq, port); +if (port->irq) +free_irq (port->irq, port); +else +del_timer_sync (&pp->tmr); }static const char *altera_uart_type (struct uart_port *port)
Signature · 1 line
1.7.2
PATCH 36/49 altera_uart: Add support for getting mapbase and IRQ from resources
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
This makes it much easier to integrate the driver with the rest of the Linux (e.g. MFD subsystem).
The old method is still supported though.
Also, from now on, there is one platform device per port (no changes are needed for the platform code, as no one registers the devices anywhere in-tree yet).
--- drivers/serial/altera_uart.c | 60 ++++++++++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 22 deletions(-)
drivers/serial/altera_uart.c +38 -22
@@ -498,38 +498,54 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) {struct altera_uart_platform_uart *platp = pdev->dev.platform_data;struct uart_port *port; -int i; +struct resource *res_mem; +struct resource *res_irq; +int i = pdev->id; -for (i =0 ; i <CONFIG_SERIAL_ALTERA_UART_MAXPORTS && platp[i].mapbase; i++) { - port = &altera_uart_ports[i].port; +/* -1 emphasizes that the platform must have one port, no .N suffix */ +if (i ==-1 ) + i =0 ; - port->line = i; - port->type =PORT_ALTERA_UART ; - port->mapbase = platp[i].mapbase; - port->membase =ioremap (port->mapbase,ALTERA_UART_SIZE ); - port->iotype =SERIAL_IO_MEM ; - port->irq = platp[i].irq; - port->uartclk = platp[i].uartclk; - port->ops = &altera_uart_ops; - port->flags =ASYNC_BOOT_AUTOCONF ; +if (i >=CONFIG_SERIAL_ALTERA_UART_MAXPORTS ) +return -EINVAL ; -uart_add_one_port (&altera_uart_driver, port); - } + port = &altera_uart_ports[i].port; + + res_mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (res_mem) + port->mapbase = res_mem->start; +else if (platp->mapbase) + port->mapbase = platp->mapbase; +else +return -EINVAL ; + + res_irq =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); +if (res_irq) + port->irq = res_irq->start; +else if (platp->irq) + port->irq = platp->irq; + + port->membase =ioremap (port->mapbase,ALTERA_UART_SIZE ); +if (!port->membase) +return -ENOMEM ; + + port->line = i; + port->type =PORT_ALTERA_UART ; + port->iotype =SERIAL_IO_MEM ; + port->uartclk = platp->uartclk; + port->ops = &altera_uart_ops; + port->flags =ASYNC_BOOT_AUTOCONF ; + +uart_add_one_port (&altera_uart_driver, port);return 0 ; } static int __devexit altera_uart_remove(struct platform_device *pdev) { -struct uart_port *port; -int i; - -for (i =0 ; i <CONFIG_SERIAL_ALTERA_UART_MAXPORTS ; i++) { - port = &altera_uart_ports[i].port; -if (port) -uart_remove_one_port (&altera_uart_driver, port); - } +struct uart_port *port = &altera_uart_ports[pdev->id].port; +uart_remove_one_port (&altera_uart_driver, port);return 0 ; }
Signature · 1 line
1.7.2
PATCH 37/49 altera_uart: Add support for different address strides
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
Some controllers implement registers with a stride, to support those we must implement the proper IO accessors.
--- drivers/serial/altera_uart.c | 58 ++++++++++++++++++++++++++--------------- include/linux/altera_uart.h | 1 + 2 files changed, 38 insertions(+), 21 deletions(-)
drivers/serial/altera_uart.c +37 -21
@@ -82,9 +82,23 @@ struct altera_uart {unsigned short imr;/* Local IMR mirror */ }; +static u32 altera_uart_readl (struct uart_port *port,int reg) +{ +struct altera_uart_platform_uart *platp = port->private_data; + +return readl (port->membase + (reg << platp->bus_shift)); +} + +static void altera_uart_writel (struct uart_port *port,u32 dat,int reg) +{ +struct altera_uart_platform_uart *platp = port->private_data; + +writel (dat, port->membase + (reg << platp->bus_shift)); +} +static unsigned int altera_uart_tx_empty (struct uart_port *port) { -return (readl (port->membase +ALTERA_UART_STATUS_REG ) & +return (altera_uart_readl (port,ALTERA_UART_STATUS_REG ) &ALTERA_UART_STATUS_TMT_MSK ) ?TIOCSER_TEMT :0 ; }
@@ -93,8 +107,7 @@ static unsigned int altera_uart_get_mctrl(struct uart_port *port) struct altera_uart *pp = container_of(port, struct altera_uart, port);unsigned int sigs; - sigs = - (readl (port->membase +ALTERA_UART_STATUS_REG ) & + sigs = (altera_uart_readl (port,ALTERA_UART_STATUS_REG ) &ALTERA_UART_STATUS_CTS_MSK ) ?TIOCM_CTS :0 ; sigs |= (pp->sigs &TIOCM_RTS );
@@ -110,7 +123,7 @@ static void altera_uart_set_mctrl(struct uart_port *port, unsigned int sigs) pp->imr |=ALTERA_UART_CONTROL_RTS_MSK ; else pp->imr &= ~ALTERA_UART_CONTROL_RTS_MSK; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG ); }static void altera_uart_start_tx (struct uart_port *port)
@@ -118,7 +131,7 @@ static void altera_uart_start_tx(struct uart_port *port) struct altera_uart *pp = container_of(port, struct altera_uart, port); pp->imr |=ALTERA_UART_CONTROL_TRDY_MSK ; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG ); }static void altera_uart_stop_tx (struct uart_port *port)
@@ -126,7 +139,7 @@ static void altera_uart_stop_tx(struct uart_port *port) struct altera_uart *pp = container_of(port, struct altera_uart, port); pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK ; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG ); }static void altera_uart_stop_rx (struct uart_port *port)
@@ -134,7 +147,7 @@ static void altera_uart_stop_rx(struct uart_port *port) struct altera_uart *pp = container_of(port, struct altera_uart, port); pp->imr &= ~ALTERA_UART_CONTROL_RRDY_MSK ; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG ); }static void altera_uart_break_ctl (struct uart_port *port,int break_state)
@@ -147,7 +160,7 @@ static void altera_uart_break_ctl(struct uart_port *port, int break_state) pp->imr |=ALTERA_UART_CONTROL_TRBK_MSK ; else pp->imr &= ~ALTERA_UART_CONTROL_TRBK_MSK; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG );spin_unlock_irqrestore (&port->lock, flags); }
@@ -171,7 +184,7 @@ static void altera_uart_set_termios(struct uart_port *port,spin_lock_irqsave (&port->lock, flags);uart_update_timeout (port, termios->c_cflag, baud); -writel (baudclk, port->membase +ALTERA_UART_DIVISOR_REG ); +altera_uart_writel (port, baudclk,ALTERA_UART_DIVISOR_REG );spin_unlock_irqrestore (&port->lock, flags); }
@@ -181,14 +194,15 @@ static void altera_uart_rx_chars(struct altera_uart *pp)unsigned char ch, flag;unsigned short status; -while ((status =readl (port->membase +ALTERA_UART_STATUS_REG )) & +while ((status =altera_uart_readl (port,ALTERA_UART_STATUS_REG )) &ALTERA_UART_STATUS_RRDY_MSK ) { - ch =readl (port->membase +ALTERA_UART_RXDATA_REG ); + ch =altera_uart_readl (port,ALTERA_UART_RXDATA_REG ); flag =TTY_NORMAL ; port->icount.rx++;if (status &ALTERA_UART_STATUS_E_MSK ) { -writel (status, port->membase +ALTERA_UART_STATUS_REG ); +altera_uart_writel (port, status, +ALTERA_UART_STATUS_REG );if (status &ALTERA_UART_STATUS_BRK_MSK ) { port->icount.brk++;
@@ -228,18 +242,18 @@ static void altera_uart_tx_chars(struct altera_uart *pp)if (port->x_char) {/* Send special char - probably flow control */ -writel (port->x_char, port->membase +ALTERA_UART_TXDATA_REG ); +altera_uart_writel (port, port->x_char,ALTERA_UART_TXDATA_REG ); port->x_char =0 ; port->icount.tx++;return ; } -while (readl (port->membase +ALTERA_UART_STATUS_REG ) & +while (altera_uart_readl (port,ALTERA_UART_STATUS_REG ) &ALTERA_UART_STATUS_TRDY_MSK ) {if (xmit->head == xmit->tail)break ; -writel (xmit->buf[xmit->tail], - port->membase +ALTERA_UART_TXDATA_REG ); +altera_uart_writel (port, xmit->buf[xmit->tail], +ALTERA_UART_TXDATA_REG ); xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); port->icount.tx++; }
@@ -249,7 +263,7 @@ static void altera_uart_tx_chars(struct altera_uart *pp)if (xmit->head == xmit->tail) { pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK ; -writel (pp->imr, port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port, pp->imr,ALTERA_UART_CONTROL_REG ); } }
@@ -259,7 +273,7 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data) struct altera_uart *pp = container_of(port, struct altera_uart, port);unsigned int isr; - isr =readl (port->membase +ALTERA_UART_STATUS_REG ) & pp->imr; + isr =altera_uart_readl (port,ALTERA_UART_STATUS_REG ) & pp->imr;spin_lock (&port->lock);if (isr &ALTERA_UART_STATUS_RRDY_MSK )
@@ -285,9 +299,9 @@ static void altera_uart_config_port(struct uart_port *port, int flags) port->type =PORT_ALTERA_UART ;/* Clear mask, so no surprise interrupts. */ -writel (0 , port->membase +ALTERA_UART_CONTROL_REG ); +altera_uart_writel (port,0 ,ALTERA_UART_CONTROL_REG );/* Clear status register */ -writel (0 , port->membase +ALTERA_UART_STATUS_REG ); +altera_uart_writel (port,0 ,ALTERA_UART_STATUS_REG ); }static int altera_uart_startup (struct uart_port *port)
@@ -407,6 +421,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp) port->uartclk = platp[i].uartclk; port->flags =ASYNC_BOOT_AUTOCONF ; port->ops = &altera_uart_ops; + port->private_data = platp; }return 0 ;
@@ -414,7 +429,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)static void altera_uart_console_putc (struct uart_port *port,const char c) { -while (!(readl (port->membase +ALTERA_UART_STATUS_REG ) & +while (!(altera_uart_readl (port,ALTERA_UART_STATUS_REG ) &ALTERA_UART_STATUS_TRDY_MSK ))cpu_relax ();
@@ -535,6 +550,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) port->uartclk = platp->uartclk; port->ops = &altera_uart_ops; port->flags =ASYNC_BOOT_AUTOCONF ; + port->private_data = platp;uart_add_one_port (&altera_uart_driver, port);
include/linux/altera_uart.h +1 -0
@@ -9,6 +9,7 @@ struct altera_uart_platform_uart {unsigned long mapbase;/* Physical address base */ unsigned int irq;/* Interrupt vector */ unsigned int uartclk;/* UART clock rate */ + unsigned int bus_shift; /* Bus shift (address stride) */ };#endif /* __ALTUART_H */
Signature · 1 line
1.7.2
PATCH 38/49 altera_uart: Make it possible to use Altera UART and 8250 ports together
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
This fixes tty name, major and minor numbers. The major number 204 is used across many platform-specific serial drivers, so we use that.
--- drivers/serial/altera_uart.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/serial/altera_uart.c +7 -4
@@ -28,6 +28,8 @@#include <linux/altera_uart.h> #define DRV_NAME "altera_uart" +#define SERIAL_ALTERA_MAJOR 204 +#define SERIAL_ALTERA_MINOR 213/* * Altera UART register definitions according to the Nios UART datasheet:
@@ -471,7 +473,7 @@ static int __init altera_uart_console_setup(struct console *co, char *options)static struct uart_driver altera_uart_driver;static struct console altera_uart_console = { - .name ="ttyS" , + .name ="ttyAL" , .write = altera_uart_console_write, .device = uart_console_device, .setup = altera_uart_console_setup,
@@ -502,9 +504,9 @@ console_initcall(altera_uart_console_init);static struct uart_driver altera_uart_driver = { .owner =THIS_MODULE , .driver_name =DRV_NAME , - .dev_name ="ttyS" , - .major =TTY_MAJOR , - .minor =64 , + .dev_name ="ttyAL" , + .major =SERIAL_ALTERA_MAJOR , + .minor =SERIAL_ALTERA_MINOR , .nr =CONFIG_SERIAL_ALTERA_UART_MAXPORTS , .cons =ALTERA_UART_CONSOLE , };
@@ -603,3 +605,4 @@ MODULE_DESCRIPTION("Altera UART driver");MODULE_AUTHOR ("Thomas Chou <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME ); +MODULE_ALIAS_CHARDEV_MAJOR (SERIAL_ALTERA_MAJOR );
Signature · 1 line
1.7.2
PATCH 39/49 altera_uart: Fixup type usage of port flags
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
port->flags is of type upf_t, which corresponds to UPF_* flags.
ASYNC_BOOT_AUTOCONF is an unsigned integer, which happen to be the same as UPF_BOOT_AUTOCONF.
--- drivers/serial/altera_uart.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/serial/altera_uart.c +2 -2
@@ -421,7 +421,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp) port->iotype =SERIAL_IO_MEM ; port->irq = platp[i].irq; port->uartclk = platp[i].uartclk; - port->flags =ASYNC_BOOT_AUTOCONF ; + port->flags =UPF_BOOT_AUTOCONF ; port->ops = &altera_uart_ops; port->private_data = platp; }
@@ -551,7 +551,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) port->iotype =SERIAL_IO_MEM ; port->uartclk = platp->uartclk; port->ops = &altera_uart_ops; - port->flags =ASYNC_BOOT_AUTOCONF ; + port->flags =UPF_BOOT_AUTOCONF ; port->private_data = platp;uart_add_one_port (&altera_uart_driver, port);
Signature · 1 line
1.7.2
PATCH 40/49 altera_uart: Fix missing prototype for registering an early console
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
Simply add an early_altera_uart_setup() prototype declaration, otherwise platform code have to do it in .c files, which is ugly.
--- include/linux/altera_uart.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
include/linux/altera_uart.h +4 -0
@@ -5,6 +5,8 @@ #ifndef __ALTUART_H #define __ALTUART_H +#include <linux/init.h> + struct altera_uart_platform_uart { unsigned long mapbase; /* Physical address base */ unsigned int irq; /* Interrupt vector */
@@ -12,4 +14,6 @@ struct altera_uart_platform_uart { unsigned int bus_shift; /* Bus shift (address stride) */ }; +int __init early_altera_uart_setup (struct altera_uart_platform_uart *platp); +#endif /* __ALTUART_H */
Signature · 1 line
1.7.2
PATCH 41/49 altera_uart: Don't use plain integer as NULL pointer
In reply to Greg KHFrom: Anton Vorontsov <[email protected]>
Fixes sparse warning.
--- drivers/serial/altera_uart.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/altera_uart.c +1 -1
@@ -461,7 +461,7 @@ static int __init altera_uart_console_setup(struct console *co, char *options)if (co->index <0 || co->index >=CONFIG_SERIAL_ALTERA_UART_MAXPORTS )return -EINVAL ; port = &altera_uart_ports[co->index].port; -if (port->membase ==0 ) +if (!port->membase)return -ENODEV ;if (options)
Signature · 1 line
1.7.2
PATCH 43/49 Alchemy: Add UART PM methods.
In reply to Greg KHFrom: Manuel Lauss <[email protected]>
Custom UART PM hook for Alchemy chips: do standard UART pm and additionally en/disable uart block clocks as needed.
This allows to get rid of a debug port PM hack in the Alchemy pm code.
Tested on Db1200.
--- arch/mips/alchemy/common/platform.c | 28 ++++++++++++++++++++++++++++ arch/mips/alchemy/common/power.c | 35 ----------------------------------- 2 files changed, 28 insertions(+), 35 deletions(-)
arch/mips/alchemy/common/platform.c +28 -0
@@ -24,6 +24,33 @@#include <prom.h> +static void alchemy_8250_pm (struct uart_port *port,unsigned int state, +unsigned int old_state) +{ +switch (state) { +case 0 : +if ((__raw_readl (port->membase +UART_MOD_CNTRL ) &3 ) !=3 ) { +/* power-on sequence as suggested in the databooks */ +__raw_writel (0 , port->membase +UART_MOD_CNTRL ); +wmb (); +__raw_writel (1 , port->membase +UART_MOD_CNTRL ); +wmb (); + } +__raw_writel (3 , port->membase +UART_MOD_CNTRL );/* full on */ +wmb (); +serial8250_do_pm (port, state, old_state); +break ; +case 3 :/* power off */ +serial8250_do_pm (port, state, old_state); +__raw_writel (0 , port->membase +UART_MOD_CNTRL ); +wmb (); +break ; +default : +serial8250_do_pm (port, state, old_state); +break ; + } +} +#define PORT (_base, _irq) \ { \ .mapbase = _base, \
@@ -33,6 +60,7 @@ .flags = UPF_SKIP_TEST | UPF_IOREMAP | \ UPF_FIXED_TYPE, \ .type = PORT_16550A, \ + .pm = alchemy_8250_pm, \ }static struct plat_serial8250_port au1x00_uart_data[] = {
arch/mips/alchemy/common/power.c +0 -35
@@ -49,11 +49,6 @@* We only have to save/restore registers that aren't otherwise * done as part of a driver pm_* function. */ -static unsigned int sleep_uart0_inten; -static unsigned int sleep_uart0_fifoctl; -static unsigned int sleep_uart0_linectl; -static unsigned int sleep_uart0_clkdiv; -static unsigned int sleep_uart0_enable;static unsigned int sleep_usb[2 ];static unsigned int sleep_sys_clocks[5 ];static unsigned int sleep_sys_pinfunc;
@@ -62,22 +57,6 @@ static unsigned int sleep_static_memctlr[4][3];static void save_core_regs (void ) { -extern void save_au1xxx_intctl (void ); -extern void pm_eth0_shutdown (void ); - -/* -* Do the serial ports.....these really should be a pm_* -* registered function by the driver......but of course the -* standard serial driver doesn't understand our Au1xxx -* unique registers. -*/ - sleep_uart0_inten =au_readl (UART0_ADDR +UART_IER ); - sleep_uart0_fifoctl =au_readl (UART0_ADDR +UART_FCR ); - sleep_uart0_linectl =au_readl (UART0_ADDR +UART_LCR ); - sleep_uart0_clkdiv =au_readl (UART0_ADDR +UART_CLK ); - sleep_uart0_enable =au_readl (UART0_ADDR +UART_MOD_CNTRL ); -au_sync (); -#ifndef CONFIG_SOC_AU1200 /* Shutdown USB host/device. */ sleep_usb[0 ] =au_readl (USB_HOST_CONFIG );
@@ -175,20 +154,6 @@ static void restore_core_regs(void)au_writel (sleep_static_memctlr[3 ][0 ],MEM_STCFG3 );au_writel (sleep_static_memctlr[3 ][1 ],MEM_STTIME3 );au_writel (sleep_static_memctlr[3 ][2 ],MEM_STADDR3 ); - -/* -* Enable the UART if it was enabled before sleep. -* I guess I should define module control bits........ -*/ -if (sleep_uart0_enable &0x02 ) { -au_writel (0 ,UART0_ADDR +UART_MOD_CNTRL );au_sync (); -au_writel (1 ,UART0_ADDR +UART_MOD_CNTRL );au_sync (); -au_writel (3 ,UART0_ADDR +UART_MOD_CNTRL );au_sync (); -au_writel (sleep_uart0_inten,UART0_ADDR +UART_IER );au_sync (); -au_writel (sleep_uart0_fifoctl,UART0_ADDR +UART_FCR );au_sync (); -au_writel (sleep_uart0_linectl,UART0_ADDR +UART_LCR );au_sync (); -au_writel (sleep_uart0_clkdiv,UART0_ADDR +UART_CLK );au_sync (); - } }void au_sleep (void )
Signature · 1 line
1.7.2
PATCH 44/49 jsm: Remove the uart port on errors
In reply to Greg KHFrom: Breno Leitao <[email protected]>
If kzmalloc fails, the uart port is not removed causing a leak. This patch just add another label that removes the uart when the kzmalloc fails.
--- drivers/serial/jsm/jsm_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/serial/jsm/jsm_driver.c +3 -1
@@ -172,13 +172,15 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_devicejsm_uart_port_init here! */ dev_err (&pdev->dev,"memory allocation for flipbuf failed\n" ); rc = -ENOMEM ; - goto out_free_irq; + goto out_free_uart; }pci_set_drvdata (pdev, brd);pci_save_state (pdev);return 0 ; + out_free_uart: +jsm_remove_uart_port (brd); out_free_irq:jsm_remove_uart_port (brd);free_irq (brd->irq, brd);
Signature · 1 line
1.7.2
PATCH 47/49 serial: abstraction for 8250 legacy ports
In reply to Greg KHFrom: Alan Cox <[email protected]>
Not every platform that has generic legacy 8250 ports manages to have them clocked the right way or without errata. Provide a generic interface to allow platforms to override the default behaviour in a manner that dumps the complexity in *their* code not the 8250 driver.
--- drivers/serial/8250.c | 17 +++++++++++++++++ include/linux/serial_8250.h | 4 ++++ 2 files changed, 21 insertions(+), 0 deletions(-)
drivers/serial/8250.c +17 -0
@@ -2672,6 +2672,16 @@ static struct uart_ops serial8250_pops = {static struct uart_8250_port serial8250_ports[UART_NR ]; +static void (*serial8250_isa_config)(int port,struct uart_port *up, +unsigned short *capabilities); + +void serial8250_set_isa_configurator ( +void (*v)(int port,struct uart_port *up,unsigned short *capabilities)) +{ + serial8250_isa_config = v; +} +EXPORT_SYMBOL (serial8250_set_isa_configurator); +static void __init serial8250_isa_init_ports (void ) {struct uart_8250_port *up;
@@ -2717,6 +2727,9 @@ static void __init serial8250_isa_init_ports(void) up->port.regshift = old_serial_port[i].iomem_reg_shift;set_io_from_upio (&up->port); up->port.irqflags |= irqflag; +if (serial8250_isa_config !=NULL ) +serial8250_isa_config (i, &up->port, &up->capabilities); + } }
@@ -3178,6 +3191,10 @@ int serial8250_register_port(struct uart_port *port)if (port->pm) uart->port.pm = port->pm; +if (serial8250_isa_config !=NULL ) +serial8250_isa_config (0 , &uart->port, + &uart->capabilities); + ret =uart_add_one_port (&serial8250_reg, &uart->port);if (ret ==0 ) ret = uart->port.line;
include/linux/serial_8250.h +4 -0
@@ -81,4 +81,8 @@ extern void serial8250_do_set_termios(struct uart_port *port,extern void serial8250_do_pm (struct uart_port *port,unsigned int state,unsigned int oldstate); +extern void serial8250_set_isa_configurator (void (*v) + (int port,struct uart_port *up, +unsigned short *capabilities)); +#endif
Signature · 1 line
1.7.2
PATCH 48/49 serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
In reply to Greg KHFrom: Sonic Zhang <[email protected]>
The actual uart baud rate of devices vary between +/-2% of what is asked. The SPORT RX sample rate should be faster than double of the worst case. Otherwise, wrong data may be received. So set SPORT RX clock to be 3% faster in general.
--- drivers/serial/bfin_sport_uart.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/serial/bfin_sport_uart.c +6 -1
@@ -131,7 +131,12 @@ static int sport_uart_setup(struct sport_uart_port *up, int size, int baud_rate)pr_debug ("%s RCR1:%x, RCR2:%x\n" , __func__,SPORT_GET_RCR1 (up),SPORT_GET_RCR2 (up)); tclkdiv = sclk / (2 * baud_rate) -1 ; - rclkdiv = sclk / (2 * baud_rate *2 ) -1 ; +/* The actual uart baud rate of devices vary between +/-2%. The sport +* RX sample rate should be faster than the double of the worst case, +* otherwise, wrong data are received. So, set sport RX clock to be +* 3% faster. +*/ + rclkdiv = sclk / (2 * baud_rate *2 *97 /100 ) -1 ;SPORT_PUT_TCLKDIV (up, tclkdiv);SPORT_PUT_RCLKDIV (up, rclkdiv);SSYNC ();
Signature · 1 line
1.7.2
PATCH 49/49 serial8250: ratelimit "too much work" error
In reply to Greg KHFrom: Daniel Drake <[email protected]>
Running a serial console, if too many kernel messages are generated within a short time causing a lot of serial I/O, the 8250 driver will generate another kernel message reporting this, which just adds to the I/O. It has a cascading effect and quickly results the system being brought to its knees by a flood of "too much work" messages.
Ratelimit the error message to avoid this.
--- drivers/serial/8250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/serial/8250.c +3 -2
@@ -31,6 +31,7 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/tty.h> +#include <linux/ratelimit.h> #include <linux/tty_flip.h> #include <linux/serial_reg.h> #include <linux/serial_core.h>
@@ -1600,8 +1601,8 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)if (l == i->head && pass_counter++ >PASS_LIMIT ) {/* If we hit this, we're dead. */ -printk (KERN_ERR "serial8250: too much work for " -"irq%d\n" , irq); +printk_ratelimited (KERN_ERR +"serial8250: too much work for irq%d\n" , irq);break ; } }while (l != end);
Signature · 1 line
1.7.2
PATCH 46/49 serial/imx: check that the buffer is non-empty before sending it out
In reply to Greg KHFrom: Volker Ernst <[email protected]>
The .start_tx callback (imx_start_tx here) isn't only called when the buffer is non-empty. E.g. after resume or when handshaking is enabled and the other side starts to signal being ready.
So check for an empty puffer already before sending the first character. This prevents sending out stale (or uninitialised) data.
--- drivers/serial/imx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/serial/imx.c +2 -3
@@ -327,14 +327,13 @@ static inline void imx_transmit_buffer(struct imx_port *sport) {struct circ_buf *xmit = &sport->port.state->xmit; -while (!(readl (sport->port.membase +UTS ) &UTS_TXFULL )) { +while (!uart_circ_empty (xmit) && + !(readl (sport->port.membase +UTS ) &UTS_TXFULL )) {/* send xmit->buf[xmit->tail] * out the port here */ writel (xmit->buf[xmit->tail], sport->port.membase +URTX0 ); xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); sport->port.icount.tx++; -if (uart_circ_empty (xmit)) -break ; }if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )
Signature · 1 line
1.7.2
PATCH 45/49 serial: mfd: add more baud rates support
In reply to Greg KHFrom: Feng Tang <[email protected]>
Add more baud rates support referring the baud_table[] defined in drivers/char/tty_ioctl.c: 3000000/2000000/1000000/500000
--- drivers/serial/mfd.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-)
drivers/serial/mfd.c +27 -14
@@ -929,39 +929,52 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, cval |=UART_LCR_EPAR ;/* +* The base clk is 50Mhz, and the baud rate come from: +* baud = 50M * MUL / (DIV * PS * DLAB) +* * For those basic low baud rate we can get the direct -* scalar from 2746800, like 115200 = 2746800/24, for those -* higher baud rate, we have to handle them case by case, -* but DIV reg is never touched as its default value 0x3d09 +* scalar from 2746800, like 115200 = 2746800/24. For those +* higher baud rate, we handle them case by case, mainly by +* adjusting the MUL/PS registers, and DIV register is kept +* as default value 0x3d09 to make things simple */ baud =uart_get_baud_rate (port, termios, old,0 ,4000000 ); - quot =uart_get_divisor (port, baud); + quot =1 ;switch (baud) {case 3500000 : mul =0x3345 ; ps =0xC ; - quot =1 ; +break ; +case 3000000 : + mul =0x2EE0 ;break ;case 2500000 : mul =0x2710 ; - ps =0x10 ; - quot =1 ;break ; -case 18432000 : +case 2000000 : + mul =0x1F40 ; +break ; +case 1843200 : mul =0x2400 ; - ps =0x10 ; - quot =1 ;break ;case 1500000 : - mul =0x1D4C ; - ps =0xc ; - quot =1 ; + mul =0x1770 ; +break ; +case 1000000 : + mul =0xFA0 ; +break ; +case 500000 : + mul =0x7D0 ;break ;default : - ; +/* Use uart_get_divisor to get quot for other baud rates */ + quot =0 ; } +if (!quot) + quot =uart_get_divisor (port, baud); +if ((up->port.uartclk / quot) < (2400 *16 )) fcr =UART_FCR_ENABLE_FIFO |UART_FCR_HSU_64_1B ;else if ((up->port.uartclk / quot) < (230400 *16 ))
Signature · 1 line
1.7.2
PATCH 42/49 8250: allow platforms to override PM hook.
In reply to Greg KHFrom: Manuel Lauss <[email protected]>
Add a hook for platforms to specify custom pm methods.
--- drivers/serial/8250.c | 27 ++++++++++++++++----------- include/linux/serial_8250.h | 4 ++++ include/linux/serial_core.h | 2 ++ 3 files changed, 22 insertions(+), 11 deletions(-)
drivers/serial/8250.c +16 -11
@@ -154,12 +154,6 @@ struct uart_8250_port {unsigned char lsr_saved_flags;#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTAunsigned char msr_saved_flags; - -/* -* We provide a per-port pm hook. -*/ -void (*pm)(struct uart_port *port, -unsigned int state,unsigned int old); };struct irq_info {
@@ -2436,16 +2430,24 @@ serial8250_set_ldisc(struct uart_port *port, int new) port->flags &= ~UPF_HARDPPS_CD ; } -static void -serial8250_pm (struct uart_port *port,unsigned int state, -unsigned int oldstate) + +void serial8250_do_pm (struct uart_port *port,unsigned int state, +unsigned int oldstate) {struct uart_8250_port *p = (struct uart_8250_port *)port;serial8250_set_sleep (p, state !=0 ); +} +EXPORT_SYMBOL (serial8250_do_pm); -if (p->pm) - p->pm (port, state, oldstate); +static void +serial8250_pm (struct uart_port *port,unsigned int state, +unsigned int oldstate) +{ +if (port->pm) + port->pm (port, state, oldstate); +else +serial8250_do_pm (port, state, oldstate); }static unsigned int serial8250_port_size (struct uart_8250_port *pt)
@@ -3006,6 +3008,7 @@ static int __devinit serial8250_probe(struct platform_device *dev) port.serial_in = p->serial_in; port.serial_out = p->serial_out; port.set_termios = p->set_termios; + port.pm = p->pm; port.dev = &dev->dev; port.irqflags |= irqflag; ret =serial8250_register_port (&port);
@@ -3172,6 +3175,8 @@ int serial8250_register_port(struct uart_port *port)/* Possibly override set_termios call */ if (port->set_termios) uart->port.set_termios = port->set_termios; +if (port->pm) + uart->port.pm = port->pm; ret =uart_add_one_port (&serial8250_reg, &uart->port);if (ret ==0 )
include/linux/serial_8250.h +4 -0
@@ -35,6 +35,8 @@ struct plat_serial8250_port {void (*set_termios)(struct uart_port *,struct ktermios *new,struct ktermios *old); +void (*pm)(struct uart_port *,unsigned int state, +unsigned old); };/*
@@ -76,5 +78,7 @@ extern int serial8250_find_port_for_earlycon(void);extern int setup_early_serial8250_console (char *cmdline);extern void serial8250_do_set_termios (struct uart_port *port,struct ktermios *termios,struct ktermios *old); +extern void serial8250_do_pm (struct uart_port *port,unsigned int state, +unsigned int oldstate);#endif
include/linux/serial_core.h +2 -0
@@ -289,6 +289,8 @@ struct uart_port {void (*set_termios)(struct uart_port *,struct ktermios *new,struct ktermios *old); +void (*pm)(struct uart_port *,unsigned int state, +unsigned int old);unsigned int irq;/* irq number */ unsigned long irqflags;/* irq flags */ unsigned int uartclk;/* base uart clock */
Signature · 1 line
1.7.2
PATCH 29/49 vcs: add poll/fasync support
In reply to Greg KHFrom: Nicolas Pitre <[email protected]>
The /dev/vcs* devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from /dev/vcsa0 whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.
To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the /dev/vcs* devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the last read() operation. The application still has to lseek() back as usual in order to read() the new data.
Not to create unwanted overhead, the needed data structure is allocated and the vt notification callback is registered only when the poll or fasync method is invoked for the first time per file instance.
--- drivers/char/vc_screen.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-)
drivers/char/vc_screen.c +133 -0
@@ -35,6 +35,12 @@#include <linux/console.h> #include <linux/device.h> #include <linux/smp_lock.h> +#include <linux/sched.h> +#include <linux/fs.h> +#include <linux/poll.h> +#include <linux/signal.h> +#include <linux/slab.h> +#include <linux/notifier.h> #include <asm/uaccess.h> #include <asm/byteorder.h>
@@ -45,6 +51,86 @@#undef addr#define HEADER_SIZE 4 +struct vcs_poll_data { +struct notifier_block notifier; +unsigned int cons_num; +bool seen_last_update; +wait_queue_head_t waitq; +struct fasync_struct *fasync; +}; + +static int +vcs_notifier (struct notifier_block *nb,unsigned long code,void *_param) +{ +struct vt_notifier_param *param = _param; +struct vc_data *vc = param->vc; +struct vcs_poll_data *poll = + container_of(nb, struct vcs_poll_data, notifier); +int currcons = poll->cons_num; + +if (code !=VT_UPDATE ) +return NOTIFY_DONE ; + +if (currcons ==0 ) + currcons = fg_console; +else + currcons--; +if (currcons != vc->vc_num) +return NOTIFY_DONE ; + + poll->seen_last_update = false; +wake_up_interruptible (&poll->waitq); +kill_fasync (&poll->fasync,SIGIO ,POLL_IN ); +return NOTIFY_OK ; +} + +static void +vcs_poll_data_free (struct vcs_poll_data *poll) +{ +unregister_vt_notifier (&poll->notifier); +kfree (poll); +} + +static struct vcs_poll_data * +vcs_poll_data_get (struct file *file) +{ +struct vcs_poll_data *poll = file->private_data; + +if (poll) +return poll; + + poll =kzalloc (sizeof (*poll),GFP_KERNEL ); +if (!poll) +return NULL ; + poll->cons_num =iminor (file->f_path.dentry->d_inode) &127 ; +init_waitqueue_head (&poll->waitq); + poll->notifier.notifier_call = vcs_notifier; +if (register_vt_notifier (&poll->notifier) !=0 ) { +kfree (poll); +return NULL ; + } + +/* +* This code may be called either through ->poll() or ->fasync(). +* If we have two threads using the same file descriptor, they could +* both enter this function, both notice that the structure hasn't +* been allocated yet and go ahead allocating it in parallel, but +* only one of them must survive and be shared otherwise we'd leak +* memory with a dangling notifier callback. +*/ +spin_lock (&file->f_lock); +if (!file->private_data) { + file->private_data = poll; + }else { +/* someone else raced ahead of us */ +vcs_poll_data_free (poll); + poll = file->private_data; + } +spin_unlock (&file->f_lock); + +return poll; +} +static int vcs_size (struct inode *inode) {
@@ -102,6 +188,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)struct inode *inode = file->f_path.dentry->d_inode;unsigned int currcons =iminor (inode);struct vc_data *vc; +struct vcs_poll_data *poll;long pos;long viewed, attr, read;int col, maxcol;
@@ -134,6 +221,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) ret = -EINVAL ;if (pos <0 ) goto unlock_out; + poll = file->private_data; +if (count && poll) + poll->seen_last_update = true; read =0 ; ret =0 ;while (count) {
@@ -457,6 +547,37 @@ unlock_out:return ret; } +static unsigned int +vcs_poll (struct file *file,poll_table *wait) +{ +struct vcs_poll_data *poll =vcs_poll_data_get (file); +int ret =0 ; + +if (poll) { +poll_wait (file, &poll->waitq, wait); +if (!poll->seen_last_update) + ret =POLLIN |POLLRDNORM ; + } +return ret; +} + +static int +vcs_fasync (int fd,struct file *file,int on) +{ +struct vcs_poll_data *poll = file->private_data; + +if (!poll) { +/* don't allocate anything if all we want is disable fasync */ +if (!on) +return 0 ; + poll =vcs_poll_data_get (file); +if (!poll) +return -ENOMEM ; + } + +return fasync_helper (fd, file, on, &poll->fasync); +} +static int vcs_open (struct inode *inode,struct file *filp) {
@@ -470,11 +591,23 @@ vcs_open(struct inode *inode, struct file *filp)return ret; } +static int vcs_release (struct inode *inode,struct file *file) +{ +struct vcs_poll_data *poll = file->private_data; + +if (poll) +vcs_poll_data_free (poll); +return 0 ; +} +static const struct file_operations vcs_fops = { .llseek = vcs_lseek, .read = vcs_read, .write = vcs_write, + .poll = vcs_poll, + .fasync = vcs_fasync, .open = vcs_open, + .release = vcs_release, };static struct class *vc_class;
Signature · 1 line
1.7.2
PATCH 27/49 tty: Fix warning left over from TIOCGICOUNT changes
In reply to Greg KHFrom: Alan Cox <[email protected]>
--- drivers/usb/serial/ssu100.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/usb/serial/ssu100.c +0 -2
@@ -444,8 +444,6 @@ static int ssu100_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) {struct usb_serial_port *port = tty->driver_data; -struct ssu100_port_private *priv =usb_get_serial_port_data (port); -void __user *user_arg = (void __user *)arg;dbg ("%s cmd 0x%04x" , __func__, cmd);
Signature · 1 line
1.7.2
PATCH 25/49 tty: Convert the USB drivers to the new icount interface
In reply to Greg KHFrom: Alan Cox <[email protected]>
Simple pasting job using the new ops function. Also fix a couple of devices directly returning the internal struct (which happens at this point to match for the fields that matter but isn't correct or futureproof)
--- drivers/net/usb/hso.c | 35 ++++++++++----------- drivers/usb/serial/ark3116.c | 40 +++++++++++++----------- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/io_edgeport.c | 49 ++++++++++++++++------------- drivers/usb/serial/io_tables.h | 4 ++ drivers/usb/serial/io_ti.c | 29 +++++++++++++---- drivers/usb/serial/mos7720.c | 54 +++++++++++++++++--------------- drivers/usb/serial/mos7840.c | 53 +++++++++++++++++-------------- drivers/usb/serial/ssu100.c | 46 +++++++++++++++------------- drivers/usb/serial/ti_usb_3410_5052.c | 37 +++++++++++++++++----- 10 files changed, 203 insertions(+), 145 deletions(-)
drivers/net/usb/hso.c +16 -19
@@ -1645,11 +1645,11 @@ hso_wait_modem_status(struct hso_serial *serial, unsigned long arg)* NB: both 1->0 and 0->1 transitions are counted except for * RI where only 0->1 is counted. */ -static int hso_get_count (struct hso_serial *serial, -struct serial_icounter_struct __user *icnt) +static int hso_get_count (struct tty_struct *tty, +struct serial_icounter_struct *icount) { -struct serial_icounter_struct icount;struct uart_icount cnow; +struct hso_serial *serial =get_serial_by_tty (tty);struct hso_tiocmget *tiocmget = serial->tiocmget;memset (&icount,0 ,sizeof (struct serial_icounter_struct ));
@@ -1660,19 +1660,19 @@ static int hso_get_count(struct hso_serial *serial,memcpy (&cnow, &tiocmget->icount,sizeof (struct uart_icount ));spin_unlock_irq (&serial->serial_lock); - icount.cts = cnow.cts; - icount.dsr = cnow.dsr; - icount.rng = cnow.rng; - icount.dcd = cnow.dcd; - icount.rx = cnow.rx; - icount.tx = cnow.tx; - icount.frame = cnow.frame; - icount.overrun = cnow.overrun; - icount.parity = cnow.parity; - icount.brk = cnow.brk; - icount.buf_overrun = cnow.buf_overrun; + icount->cts = cnow.cts; + icount->dsr = cnow.dsr; + icount->rng = cnow.rng; + icount->dcd = cnow.dcd; + icount->rx = cnow.rx; + icount->tx = cnow.tx; + icount->frame = cnow.frame; + icount->overrun = cnow.overrun; + icount->parity = cnow.parity; + icount->brk = cnow.brk; + icount->buf_overrun = cnow.buf_overrun; -return copy_to_user (icnt, &icount,sizeof (icount)) ? -EFAULT :0 ; +return 0 ; }
@@ -1764,10 +1764,6 @@ static int hso_serial_ioctl(struct tty_struct *tty, struct file *file,case TIOCMIWAIT : ret =hso_wait_modem_status (serial, arg);break ; - -case TIOCGICOUNT : - ret =hso_get_count (serial, uarg); -break ;default : ret = -ENOIOCTLCMD ;break ;
@@ -3300,6 +3296,7 @@ static const struct tty_operations hso_serial_ops = { .chars_in_buffer = hso_serial_chars_in_buffer, .tiocmget = hso_serial_tiocmget, .tiocmset = hso_serial_tiocmset, + .get_icount = hso_get_count, .unthrottle = hso_unthrottle };
drivers/usb/serial/ark3116.c +21 -19
@@ -411,6 +411,26 @@ err_out:return result; } +static int ark3116_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount) +{ +struct usb_serial_port *port = tty->driver_data; +struct ark3116_private *priv =usb_get_serial_port_data (port); +struct async_icount cnow = priv->icount; + icount->cts = cnow.cts; + icount->dsr = cnow.dsr; + icount->rng = cnow.rng; + icount->dcd = cnow.dcd; + icount->rx = cnow.rx; + icount->tx = cnow.tx; + icount->frame = cnow.frame; + icount->overrun = cnow.overrun; + icount->parity = cnow.parity; + icount->brk = cnow.brk; + icount->buf_overrun = cnow.buf_overrun; +return 0 ; +} +static int ark3116_ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg) {
@@ -460,25 +480,6 @@ static int ark3116_ioctl(struct tty_struct *tty, struct file *file,return 0 ; }break ; -case TIOCGICOUNT : { -struct serial_icounter_struct icount; -struct async_icount cnow = priv->icount; -memset (&icount,0 ,sizeof (icount)); - icount.cts = cnow.cts; - icount.dsr = cnow.dsr; - icount.rng = cnow.rng; - icount.dcd = cnow.dcd; - icount.rx = cnow.rx; - icount.tx = cnow.tx; - icount.frame = cnow.frame; - icount.overrun = cnow.overrun; - icount.parity = cnow.parity; - icount.brk = cnow.brk; - icount.buf_overrun = cnow.buf_overrun; -if (copy_to_user (user_arg, &icount,sizeof (icount))) -return -EFAULT ; -return 0 ; - } }return -ENOIOCTLCMD ;
@@ -736,6 +737,7 @@ static struct usb_serial_driver ark3116_device = { .ioctl = ark3116_ioctl, .tiocmget = ark3116_tiocmget, .tiocmset = ark3116_tiocmset, + .get_icount = ark3116_get_icount, .open = ark3116_open, .close = ark3116_close, .break_ctl = ark3116_break_ctl,
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -2168,6 +2168,7 @@ static int ftdi_ioctl(struct tty_struct *tty, struct file *file,* - mask passed in arg for lines of interest * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking) * Caller should use TIOCGICOUNT to see which one it was. +* (except that the driver doesn't support it !) * * This code is borrowed from linux/drivers/char/serial.c */
drivers/usb/serial/io_edgeport.c +27 -22
79 lines not on this page · raw message
drivers/usb/serial/io_tables.h +4 -0
@@ -123,6 +123,7 @@ static struct usb_serial_driver edgeport_2port_device = { .set_termios = edge_set_termios, .tiocmget = edge_tiocmget, .tiocmset = edge_tiocmset, + .get_icount = edge_get_icount, .write = edge_write, .write_room = edge_write_room, .chars_in_buffer = edge_chars_in_buffer,
@@ -152,6 +153,7 @@ static struct usb_serial_driver edgeport_4port_device = { .set_termios = edge_set_termios, .tiocmget = edge_tiocmget, .tiocmset = edge_tiocmset, + .get_icount = edge_get_icount, .write = edge_write, .write_room = edge_write_room, .chars_in_buffer = edge_chars_in_buffer,
@@ -181,6 +183,7 @@ static struct usb_serial_driver edgeport_8port_device = { .set_termios = edge_set_termios, .tiocmget = edge_tiocmget, .tiocmset = edge_tiocmset, + .get_icount = edge_get_icount, .write = edge_write, .write_room = edge_write_room, .chars_in_buffer = edge_chars_in_buffer,
@@ -209,6 +212,7 @@ static struct usb_serial_driver epic_device = { .set_termios = edge_set_termios, .tiocmget = edge_tiocmget, .tiocmset = edge_tiocmset, + .get_icount = edge_get_icount, .write = edge_write, .write_room = edge_write_room, .chars_in_buffer = edge_chars_in_buffer,
drivers/usb/serial/io_ti.c +22 -7
@@ -2510,6 +2510,27 @@ static int edge_tiocmget(struct tty_struct *tty, struct file *file)return result; } +static int edge_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount) +{ +struct usb_serial_port *port = tty->driver_data; +struct edgeport_port *edge_port =usb_get_serial_port_data (port); +struct async_icount *ic = &edge_port->icount; + + icount->cts = ic->cts; + icount->dsr = ic->dsr; + icount->rng = ic->rng; + icount->dcd = ic->dcd; + icount->tx = ic->tx; + icount->rx = ic->rx; + icount->frame = ic->frame; + icount->parity = ic->parity; + icount->overrun = ic->overrun; + icount->brk = ic->brk; + icount->buf_overrun = ic->buf_overrun; +return 0 ; +} +static int get_serial_info (struct edgeport_port *edge_port,struct serial_struct __user *retinfo) {
@@ -2572,13 +2593,6 @@ static int edge_ioctl(struct tty_struct *tty, struct file *file, }/* not reached */ break ; -case TIOCGICOUNT : -dbg ("%s - (%d) TIOCGICOUNT RX=%d, TX=%d" , __func__, - port->number, edge_port->icount.rx, edge_port->icount.tx); -if (copy_to_user ((void __user *)arg, &edge_port->icount, -sizeof (edge_port->icount))) -return -EFAULT ; -return 0 ; }return -ENOIOCTLCMD ; }
@@ -2758,6 +2772,7 @@ static struct usb_serial_driver edgeport_1port_device = { .set_termios = edge_set_termios, .tiocmget = edge_tiocmget, .tiocmset = edge_tiocmset, + .get_icount = edge_get_icount, .write = edge_write, .write_room = edge_write_room, .chars_in_buffer = edge_chars_in_buffer,
drivers/usb/serial/mos7720.c +29 -25
81 lines not on this page · raw message
drivers/usb/serial/mos7840.c +29 -24
77 lines not on this page · raw message
drivers/usb/serial/ssu100.c +25 -21
64 lines not on this page · raw message
drivers/usb/serial/ti_usb_3410_5052.c +29 -8
@@ -108,6 +108,8 @@ static void ti_throttle(struct tty_struct *tty);static void ti_unthrottle (struct tty_struct *tty);static int ti_ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg); +static int ti_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount);static void ti_set_termios (struct tty_struct *tty,struct usb_serial_port *port,struct ktermios *old_termios);static int ti_tiocmget (struct tty_struct *tty,struct file *file);
@@ -237,6 +239,7 @@ static struct usb_serial_driver ti_1port_device = { .set_termios = ti_set_termios, .tiocmget = ti_tiocmget, .tiocmset = ti_tiocmset, + .get_icount = ti_get_icount, .break_ctl = ti_break, .read_int_callback = ti_interrupt_callback, .read_bulk_callback = ti_bulk_in_callback,
@@ -265,6 +268,7 @@ static struct usb_serial_driver ti_2port_device = { .set_termios = ti_set_termios, .tiocmget = ti_tiocmget, .tiocmset = ti_tiocmset, + .get_icount = ti_get_icount, .break_ctl = ti_break, .read_int_callback = ti_interrupt_callback, .read_bulk_callback = ti_bulk_in_callback,
@@ -788,6 +792,31 @@ static void ti_unthrottle(struct tty_struct *tty) } } +static int ti_get_icount (struct tty_struct *tty, +struct serial_icounter_struct *icount) +{ +struct usb_serial_port *port = tty->driver_data; +struct ti_port *tport =usb_get_serial_port_data (port); +struct async_icount cnow = tport->tp_icount; + +dbg ("%s - (%d) TIOCGICOUNT RX=%d, TX=%d" , + __func__, port->number, + cnow.rx, cnow.tx); + + icount->cts = cnow.cts; + icount->dsr = cnow.dsr; + icount->rng = cnow.rng; + icount->dcd = cnow.dcd; + icount->rx = cnow.rx; + icount->tx = cnow.tx; + icount->frame = cnow.frame; + icount->overrun = cnow.overrun; + icount->parity = cnow.parity; + icount->brk = cnow.brk; + icount->buf_overrun = cnow.buf_overrun; + +return 0 ; +}static int ti_ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg)
@@ -830,14 +859,6 @@ static int ti_ioctl(struct tty_struct *tty, struct file *file, cprev = cnow; }break ; -case TIOCGICOUNT : -dbg ("%s - (%d) TIOCGICOUNT RX=%d, TX=%d" , - __func__, port->number, - tport->tp_icount.rx, tport->tp_icount.tx); -if (copy_to_user ((void __user *)arg, &tport->tp_icount, -sizeof (tport->tp_icount))) -return -EFAULT ; -return 0 ; }return -ENOIOCTLCMD ; }
Signature · 1 line
1.7.2
PATCH 22/49 serial: mrst_max3110: Make the IRQ option runtime
In reply to Greg KHFrom: Alan Cox <[email protected]>
And while we are at it allow it to fail to find one. Without this the IRQ option will cause the 3110 driver to fail on 0.7 SFI firmware.
--- drivers/serial/Kconfig | 7 ----- drivers/serial/mrst_max3110.c | 55 +++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 34 deletions(-)
drivers/serial/Kconfig +0 -7
@@ -717,13 +717,6 @@ config SERIAL_MRST_MAX3110 the Intel Moorestown platform. On other systems use the max3100 driver. -config MRST_MAX3110_IRQ - boolean "Enable GPIO IRQ for Max3110 over Moorestown" - default n - depends on SERIAL_MRST_MAX3110 && GPIO_LANGWELL - help - This has to be enabled after Moorestown GPIO driver is loaded - config SERIAL_MFD_HSU tristate "Medfield High Speed UART support" depends on PCI
drivers/serial/mrst_max3110.c +28 -27
92 lines not on this page · raw message
Signature · 1 line
1.7.2
PATCH 20/49 tty_io: check return code of tty_register_device
In reply to Greg KHFrom: Vasiliy Kulikov <[email protected]>
Function tty_register_device may return ERR_PTR(...). Check for it.
--- drivers/char/tty_io.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-)
drivers/char/tty_io.c +22 -2
@@ -3004,6 +3004,7 @@ int tty_register_driver(struct tty_driver *driver)int i;dev_t dev;void **p =NULL ; +struct device *d;if (!(driver->flags &TTY_DRIVER_DEVPTS_MEM ) && driver->num) { p =kzalloc (driver->num *2 *sizeof (void *),GFP_KERNEL );
@@ -3051,12 +3052,31 @@ int tty_register_driver(struct tty_driver *driver)mutex_unlock (&tty_mutex);if (!(driver->flags &TTY_DRIVER_DYNAMIC_DEV )) { -for (i =0 ; i < driver->num; i++) -tty_register_device (driver, i,NULL ); +for (i =0 ; i < driver->num; i++) { + d =tty_register_device (driver, i,NULL ); +if (IS_ERR (d)) { + error =PTR_ERR (d); + goto err; + } + } }proc_tty_register_driver (driver); driver->flags |=TTY_DRIVER_INSTALLED ;return 0 ; + +err: +for (i--; i >=0 ; i--) +tty_unregister_device (driver, i); + +mutex_lock (&tty_mutex); +list_del (&driver->tty_drivers); +mutex_unlock (&tty_mutex); + +unregister_chrdev_region (dev, driver->num); + driver->ttys =NULL ; + driver->termios =NULL ; +kfree (p); +return error; }EXPORT_SYMBOL (tty_register_driver);
Signature · 1 line
1.7.2
PATCH 19/49 Char: mxser, call pci_disable_device from probe/remove
In reply to Greg KHFrom: Jiri Slaby <[email protected]>
Vasiliy found that pci_disable_device is not called on fail paths in mxser_probe. Actually, it is called from nowhere in the driver.
There are three changes needed:
1) don't use pseudo-generic mxser_release_res. Let's use it only from ISA paths from now on. All the pci stuff is moved to probe and remove PCI-related functions.
2) reorder fail-paths in the probe function so that it makes sense and we can call them from the sequential code naturally (the further we are the earlier label we go to).
3) add pci_disable_device both to mxser_probe and mxser_remove.
There is a nit of adding CONFIG_PCI ifdef to mxser_remove. it is because this driver supports ISA-only compilations and it would choke up on the newly added calls now.
--- drivers/char/mxser.c | 47 ++++++++++++++++++++++------------------------- 1 files changed, 22 insertions(+), 25 deletions(-)
drivers/char/mxser.c +22 -25
@@ -2339,20 +2339,11 @@ struct tty_port_operations mxser_port_ops = {* The MOXA Smartio/Industio serial driver boot-time initialization code! */ -static void mxser_release_res (struct mxser_board *brd,struct pci_dev *pdev, -unsigned int irq) +static void mxser_release_ISA_res (struct mxser_board *brd) { -if (irq) -free_irq (brd->irq, brd); -if (pdev !=NULL ) {/* PCI */ -#ifdef CONFIG_PCI -pci_release_region (pdev,2 ); -pci_release_region (pdev,3 ); -#endif - }else { -release_region (brd->ports[0 ].ioaddr,8 * brd->info->nports); -release_region (brd->vector,1 ); - } +free_irq (brd->irq, brd); +release_region (brd->ports[0 ].ioaddr,8 * brd->info->nports); +release_region (brd->vector,1 ); } static int __devinit mxser_initbrd(struct mxser_board *brd,
@@ -2397,13 +2388,11 @@ static int __devinit mxser_initbrd(struct mxser_board *brd, retval =request_irq (brd->irq, mxser_interrupt,IRQF_SHARED ,"mxser" , brd); -if (retval) { +if (retval)printk (KERN_ERR "Board %s: Request irq failed, IRQ (%d) may " "conflict with another device.\n" , brd->info->name, brd->irq); -/* We hold resources, we need to release them. */ -mxser_release_res (brd, pdev,0 ); - } +return retval; }
@@ -2555,7 +2544,7 @@ static int __devinit mxser_probe(struct pci_dev *pdev, ioaddress =pci_resource_start (pdev,2 ); retval =pci_request_region (pdev,2 ,"mxser(IO)" );if (retval) - goto err; + goto err_dis; brd->info = &mxser_cards[ent->driver_data];for (i =0 ; i < brd->info->nports; i++)
@@ -2565,7 +2554,7 @@ static int __devinit mxser_probe(struct pci_dev *pdev, ioaddress =pci_resource_start (pdev,3 ); retval =pci_request_region (pdev,3 ,"mxser(vector)" );if (retval) - goto err_relio; + goto err_zero; brd->vector = ioaddress;/* irq */
@@ -2608,7 +2597,7 @@ static int __devinit mxser_probe(struct pci_dev *pdev,/* mxser_initbrd will hook ISR. */ retval =mxser_initbrd (brd, pdev);if (retval) - goto err_null; + goto err_rel3;for (i =0 ; i < brd->info->nports; i++)tty_register_device (mxvar_sdriver, brd->idx + i, &pdev->dev);
@@ -2616,10 +2605,13 @@ static int __devinit mxser_probe(struct pci_dev *pdev,pci_set_drvdata (pdev, brd);return 0 ; -err_relio: -pci_release_region (pdev,2 ); -err_null: +err_rel3: +pci_release_region (pdev,3 ); +err_zero: brd->info =NULL ; +pci_release_region (pdev,2 ); +err_dis: +pci_disable_device (pdev); err:return retval;#else
@@ -2629,14 +2621,19 @@ err: static void __devexit mxser_remove(struct pci_dev *pdev) { +#ifdef CONFIG_PCI struct mxser_board *brd =pci_get_drvdata (pdev);unsigned int i;for (i =0 ; i < brd->info->nports; i++)tty_unregister_device (mxvar_sdriver, brd->idx + i); -mxser_release_res (brd, pdev,1 ); +free_irq (pdev->irq, brd); +pci_release_region (pdev,2 ); +pci_release_region (pdev,3 ); +pci_disable_device (pdev); brd->info =NULL ; +#endif }static struct pci_driver mxser_driver = {
@@ -2741,7 +2738,7 @@ static void __exit mxser_module_exit(void)for (i =0 ; i <MXSER_BOARDS ; i++)if (mxser_boards[i].info !=NULL ) -mxser_release_res (&mxser_boards[i],NULL ,1 ); +mxser_release_ISA_res (&mxser_boards[i]); }module_init (mxser_module_init);
Signature · 1 line
1.7.2
PATCH 16/49 serial-core: skip call set_termios/console_start when no_console_suspend
In reply to Greg KHFrom: Jason Wang <[email protected]>
The commit 4547be7 rewrites suspend and resume functions, this introduces a problem on the OMAP3EVM platoform. when the kernel boots with no_console_suspend and we suspend the kernel, then resume it, the serial console will be not usable. This problem should be common for all platforms.
The cause for this problem is that when enter suspend, if we choose no_console_suspend, the console_stop will be skiped. But in resume function, the console port will be set to uninitialized state by calling set_termios function and the console_start is called without checking whether the no_console_suspend is set, Now fix it.
--- drivers/serial/serial_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/serial_core.c +1 -1
@@ -2065,7 +2065,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)/* * Re-enable the console device after suspending. */ -if (uart_console (uport)) { +if (console_suspend_enabled &&uart_console (uport)) {uart_change_pm (state,0 ); uport->ops->set_termios (uport, &termios,NULL );console_start (uport->cons);
Signature · 1 line
1.7.2
PATCH 15/49 ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts s390 to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- S390 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCGRS485 and TIOCGRS485, which are unused by any driver available on this architecture
- The generic version adds support for termiox
--- arch/s390/include/asm/ioctls.h | 88 +--------------------------------------- 1 files changed, 1 insertions(+), 87 deletions(-)
arch/s390/include/asm/ioctls.h +1 -87
@@ -1,94 +1,8 @@ -/* -* include/asm-s390/ioctls.h -* -* S390 version -* -* Derived from "include/asm-i386/ioctls.h" -*/ -#ifndef __ARCH_S390_IOCTLS_H__#define __ARCH_S390_IOCTLS_H__ -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif
Signature · 1 line
1.7.2
PATCH 14/49 ioctl: Use asm-generic/ioctls.h on mn10300 (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts mn10300 to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- The generic version provides TIOCGRS485 and TIOCSRS485 but they are unused by any driver available for this architecture.
- The generic version adds support for termiox
--- arch/mn10300/include/asm/ioctls.h | 84 +------------------------------------ 1 files changed, 1 insertions(+), 83 deletions(-)
arch/mn10300/include/asm/ioctls.h +1 -83
@@ -1,88 +1,6 @@#ifndef _ASM_IOCTLS_H#define _ASM_IOCTLS_H -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T', 0x2A, struct termios2) -#define TCSETS2 _IOW('T', 0x2B, struct termios2) -#define TCSETSW2 _IOW('T', 0x2C, struct termios2) -#define TCSETSF2 _IOW('T', 0x2D, struct termios2) -#define TIOCGPTN _IOR('T', 0x30, unsigned int)/* Get Pty Number -* (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T', 0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T', 0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450 -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* _ASM_IOCTLS_H */
Signature · 1 line
1.7.2
PATCH 13/49 ioctl: Use asm-generic/ioctls.h on m68k (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts m68k to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- m68k defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCSRS485 and TIOCGRS485m which are unused by any driver available on this architecture.
- The generic version adds support for termiox
--- arch/m68k/include/asm/ioctls.h | 80 +--------------------------------------- 1 files changed, 1 insertions(+), 79 deletions(-)
arch/m68k/include/asm/ioctls.h +1 -79
@@ -1,86 +1,8 @@#ifndef __ARCH_M68K_IOCTLS_H__#define __ARCH_M68K_IOCTLS_H__ -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* __ARCH_M68K_IOCTLS_H__ */
Signature · 1 line
1.7.2
PATCH 12/49 ioctl: Use asm-generic/ioctls.h on m32r (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts m32r to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- The generic version adds TIOCGRS485 and TIOCGRS485, which are unused by any driver available on this architecture.
- The generic version adds support for termiox
--- arch/m32r/include/asm/ioctls.h | 83 +--------------------------------------- 1 files changed, 1 insertions(+), 82 deletions(-)
arch/m32r/include/asm/ioctls.h +1 -82
@@ -1,87 +1,6 @@#ifndef __ARCH_M32R_IOCTLS_H__#define __ARCH_M32R_IOCTLS_H__ -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402/* Clashes with SNDCTL_TMR_START sound ioctl */ -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450 -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* __ARCH_M32R_IOCTLS_H__ */
Signature · 1 line
1.7.2
PATCH 7/49 ioctl: Use asm-generic/ioctls.h on avr32 (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts avr32 to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- The generic version adds support for termiox
--- arch/avr32/include/asm/ioctls.h | 86 +-------------------------------------- 1 files changed, 1 insertions(+), 85 deletions(-)
arch/avr32/include/asm/ioctls.h +1 -85
@@ -1,90 +1,6 @@#ifndef __ASM_AVR32_IOCTLS_H#define __ASM_AVR32_IOCTLS_H -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402/* Clashes with SNDCTL_TMR_START sound ioctl */ -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define TIOCGRS485 0x542E -#define TIOCSRS485 0x542F - -#define FIONCLEX 0x5450 -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif /* __ASM_AVR32_IOCTLS_H */
Signature · 1 line
1.7.2
PATCH 6/49 ioctl: Use asm-generic/ioctls.h on arm (enables termiox)
In reply to Greg KHFrom: Jeff Mahoney <[email protected]>
This patch converts arm to use asm-generic/ioctls.h instead of its own version.
The differences between the arch-specific version and the generic version are as follows:
- ARM defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds support for termiox
--- arch/arm/include/asm/ioctls.h | 83 +---------------------------------------- 1 files changed, 1 insertions(+), 82 deletions(-)
arch/arm/include/asm/ioctls.h +1 -82
@@ -1,89 +1,8 @@#ifndef __ASM_ARM_IOCTLS_H#define __ASM_ARM_IOCTLS_H -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define TIOCGRS485 0x542E -#define TIOCSRS485 0x542F - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457 -#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 - -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif
Signature · 1 line
1.7.2
PATCH 4/49 serial: Add CONSOLE_POLL support for uartlite
In reply to Greg KHFrom: Michal Simek <[email protected]>
CONSOLE_POLL support for uartlite enables
KGDB debugging over serial line.
--- drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-)
drivers/serial/uartlite.c +25 -1
@@ -322,6 +322,26 @@ static int ulite_verify_port(struct uart_port *port, struct serial_struct *ser)return -EINVAL ; } +#ifdef CONFIG_CONSOLE_POLL +static int ulite_get_poll_char (struct uart_port *port) +{ +if (!(ioread32be (port->membase +ULITE_STATUS ) + &ULITE_STATUS_RXVALID )) +return NO_POLL_CHAR ; + +return ioread32be (port->membase +ULITE_RX ); +} + +static void ulite_put_poll_char (struct uart_port *port,unsigned char ch) +{ +while (ioread32be (port->membase +ULITE_STATUS ) &ULITE_STATUS_TXFULL ) +cpu_relax (); + +/* write char to device */ +iowrite32be (ch, port->membase +ULITE_TX ); +} +#endif +static struct uart_ops ulite_ops = { .tx_empty = ulite_tx_empty, .set_mctrl = ulite_set_mctrl,
@@ -338,7 +358,11 @@ static struct uart_ops ulite_ops = { .release_port = ulite_release_port, .request_port = ulite_request_port, .config_port = ulite_config_port, - .verify_port = ulite_verify_port + .verify_port = ulite_verify_port, +#ifdef CONFIG_CONSOLE_POLL + .poll_get_char = ulite_get_poll_char, + .poll_put_char = ulite_put_poll_char, +#endif };/* ---------------------------------------------------------------------
Signature · 1 line
1.7.2
PATCH 2/49 serport: place serport serio device correctly in the device tree
In reply to Greg KHFrom: Dmitry Eremin-Solenikov <[email protected]>
Make serport serio device to be a child of corresponding tty device instead of just hanging at /sys/devices/serioX.
--- drivers/input/serio/serport.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/input/serio/serport.c +1 -0
@@ -165,6 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u serio->open = serport_serio_open; serio->close = serport_serio_close; serio->port_data = serport; + serio->dev.parent = tty->dev;serio_register_port (serport->serio);printk (KERN_INFO "serio: Serial port %s\n" ,tty_name (tty, name));
Signature · 1 line
1.7.2
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Greg Kroah-HartmanQuoted 2 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +0
-0
...
Quoted 13 lines
fs/proc/proc_tty.c +9
-0@@ -137,6 +140,160 @@ static const struct file_operations proc_tty_drivers_operations = { };/* +* The device ID of file descriptor 0 of the current reading +* task if a character device... +*/ +static dev_t current_dev; + +/* +* This is the handler for /proc/tty/consoles +*/ +static int show_console_dev (struct seq_file *m,void *v)
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 161
Quoted 10 lines
fs/proc/proc_tty.c +10
-0+{ +const struct tty_driver *driver; +struct console *con; +int index, len; +char flags[10 ]; +dev_t dev; + +if (v ==SEQ_START_TOKEN ) +return 0 ; + con = (struct console *)v;
You don't hold the console sem now, so the console may be already gone, right? You should hold the sem from ->start till ->stop.
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 164
Quoted 3 lines
fs/proc/proc_tty.c +3
-0+if (!con) +return 0 ; + driver = con->device (con, &index);
Some consoles, especially the early ones don't have con->device IIRC. If, for some reason, they are not switched to proper ttyS* (e.g. the port fails to init), this will crash.
Quoted 26 lines
fs/proc/proc_tty.c +26
-0+if (!driver) +return 0 ; + dev =MKDEV (driver->major, driver->minor_start) + index; + + index =0 ; +if (con->flags &CON_ENABLED ) + flags[index++] ='E' ; +if (con->flags &CON_CONSDEV ) + flags[index++] ='C' ; +if (con->flags &CON_BOOT ) + flags[index++] ='B' ; +if (con->flags &CON_PRINTBUFFER ) + flags[index++] ='p' ; +if (con->flags &CON_BRL ) + flags[index++] ='b' ; +if (con->flags &CON_ANYTIME ) + flags[index++] ='a' ; +if (current_dev == dev) + flags[index++] ='*' ; + flags[index] =0 ; + +seq_printf (m,"%s%d%n" , con->name, con->index, &len); + len =21 - len; +if (len <1 ) + len =1 ; +seq_printf (m,"%*c" , len,' ' );
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 200
Quoted 10 lines
fs/proc/proc_tty.c +10
-0+seq_printf (m,"%c%c%c (%s)%n" , con->read ?'R' :'-' , + con->write ?'W' :'-' , con->unblank ?'U' :'-' , + flags, &len); + len =13 - len; +if (len <1 ) + len =1 ; +seq_printf (m,"%*c%4d:%d\n" , len,' ' ,MAJOR (dev),MINOR (dev)); + +return 0 ; +}
regards,
Signature · 2 lines
js suse labs
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Greg Kroah-HartmanQuoted 13 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +13
-0+/* +* Used for open /proc/tty/consoles. Before this detect +* the device ID of file descriptor 0 of the current +* reading task if a character device... +*/ +static int tty_consoles_open (struct inode *inode,struct file *file) +{ +struct files_struct *curfiles; + + current_dev =0 ; + curfiles =get_files_struct (current); +if (curfiles) { +const struct file *curfp;
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 276
Quoted 10 lines
fs/proc/proc_tty.c +10
-0+spin_lock (&curfiles->file_lock); + curfp =fcheck_files (curfiles,0 ); +if (curfp && curfp->private_data) { +const struct inode *inode; +dget (curfp->f_dentry); + inode = curfp->f_dentry->d_inode; +if (S_ISCHR (inode->i_mode)) { +struct tty_struct *tty; + tty = (struct tty_struct *)curfp->private_data; +if (tty && tty->magic ==TTY_MAGIC ) {
Ah, I've just understood what this code does. It seems, that the 'tty' at this point may be already freed (e.g. people don't set private_data to NULL). Please explain in the code why it can't...
Maybe I wouldn't bother with marking the "current" console by star at all as it seems not to pay off.
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 287
Quoted 11 lines
fs/proc/proc_tty.c +11
-0+ tty =tty_pair_get_tty (tty); + current_dev =tty_devnum (tty); + } + } +dput (curfp->f_dentry); + } +spin_unlock (&curfiles->file_lock); +put_files_struct (curfiles); + } +return seq_open (file, &tty_consoles_op); +}
regards,
Signature · 2 lines
js suse labs
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Greg Kroah-HartmanQuoted 7 lines · Greg Kroah-Hartman
From: Dr. Werner Fink <[email protected]>
Add a new file
/proc/tty/consolesto be able to determine the registered system console lines. If the reading process holds/dev/consoleopen at the regular standard input stream the active device will be marked by an asterisk. Show possible operations and also decode the used flags of the listed console lines.
Err, no way we can put in code that walks the fd table and poke into random private data for a magic number.
NAK.
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Jiri SlabyQuoted 20 lines · Jiri Slaby
Quoted 19 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +19
-0+/* +* Used for open /proc/tty/consoles. Before this detect +* the device ID of file descriptor 0 of the current +* reading task if a character device... +*/ +static int tty_consoles_open (struct inode *inode,struct file *file) +{ +struct files_struct *curfiles; + + current_dev =0 ; + curfiles =get_files_struct (current); +if (curfiles) { +const struct file *curfp; +spin_lock (&curfiles->file_lock); + curfp =fcheck_files (curfiles,0 ); +if (curfp && curfp->private_data) { +const struct inode *inode; +dget (curfp->f_dentry); + inode = curfp->f_dentry->d_inode;
Quoted 8 lines
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 276
Quoted 4 lines
fs/proc/proc_tty.c +4
-0+if (S_ISCHR (inode->i_mode)) { +struct tty_struct *tty; + tty = (struct tty_struct *)curfp->private_data; +if (tty && tty->magic ==TTY_MAGIC ) {Ah, I've just understood what this code does. It seems, that the 'tty' at this point may be already freed (e.g. people don't set
private_datato NULL). Please explain in the code why it can't...
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 30 lines · Al Viro
Quoted 20 lines · Jiri Slaby
Quoted 19 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +19
-0+/* +* Used for open /proc/tty/consoles. Before this detect +* the device ID of file descriptor 0 of the current +* reading task if a character device... +*/ +static int tty_consoles_open (struct inode *inode,struct file *file) +{ +struct files_struct *curfiles; + + current_dev =0 ; + curfiles =get_files_struct (current); +if (curfiles) { +const struct file *curfp; +spin_lock (&curfiles->file_lock); + curfp =fcheck_files (curfiles,0 ); +if (curfp && curfp->private_data) { +const struct inode *inode; +dget (curfp->f_dentry); + inode = curfp->f_dentry->d_inode;Quoted 8 lines
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 276
Quoted 4 lines
fs/proc/proc_tty.c +4
-0+if (S_ISCHR (inode->i_mode)) { +struct tty_struct *tty; + tty = (struct tty_struct *)curfp->private_data; +if (tty && tty->magic ==TTY_MAGIC ) {Ah, I've just understood what this code does. It seems, that the 'tty' at this point may be already freed (e.g. people don't set
private_datato NULL). Please explain in the code why it can't...
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Well, our complains are -ETOOLATE -- it's commit f4a3e0bceb57466c upstream. So please fix this up.
regards,
Signature · 2 lines
js suse labs
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Al ViroQuoted 30 lines · Al Viro
Quoted 20 lines · Jiri Slaby
Quoted 19 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +19
-0+/* +* Used for open /proc/tty/consoles. Before this detect +* the device ID of file descriptor 0 of the current +* reading task if a character device... +*/ +static int tty_consoles_open (struct inode *inode,struct file *file) +{ +struct files_struct *curfiles; + + current_dev =0 ; + curfiles =get_files_struct (current); +if (curfiles) { +const struct file *curfp; +spin_lock (&curfiles->file_lock); + curfp =fcheck_files (curfiles,0 ); +if (curfp && curfp->private_data) { +const struct inode *inode; +dget (curfp->f_dentry); + inode = curfp->f_dentry->d_inode;Quoted 8 lines
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 276
Quoted 4 lines
fs/proc/proc_tty.c +4
-0+if (S_ISCHR (inode->i_mode)) { +struct tty_struct *tty; + tty = (struct tty_struct *)curfp->private_data; +if (tty && tty->magic ==TTY_MAGIC ) {Ah, I've just understood what this code does. It seems, that the 'tty' at this point may be already freed (e.g. people don't set
private_datato NULL). Please explain in the code why it can't...
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
PS: "you" above applies to whoever had produced that patch, of course, not to Jiri.
PPS: "device name of stdin of last process opening that file, if that stdin happened to be a tty" is an interesting thing to put into global variable. What does one do to it?
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Jiri SlabyQuoted 9 lines · Jiri Slaby
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Well, our complains are
-ETOOLATE-- it's commitf4a3e0bceb57466cupstream. So please fix this up.
FVO "fix" equal to "revert". Belated review:
a) global variable depending on stdin of the last opener? Affecting output of read(2)? Really?
b) iterator is broken; list should be locked in ->start(), unlocked in ->stop() and *NOT* unlocked/relocked in ->next()
c) ->show() ought to do nothing in case of ->device == NULL, instead of skipping those in ->next()/->start()
d) regardless of the merits of the bright idea about asterisk at that line in output *and* regardless of (a), the implementation is not only atrociously ugly, it's actually very likely to be a roothole. Verifying that Cthulhu knows what number happens to be address of a tty_struct by blindly dereferencing memory at that address... Ouch.
Please revert that crap.
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 23 lines · Al Viro
Quoted 9 lines · Jiri Slaby
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Well, our complains are
-ETOOLATE-- it's commitf4a3e0bceb57466cupstream. So please fix this up.FVO "fix" equal to "revert". Belated review:
a) global variable depending on stdin of the last opener? Affecting output of read(2)? Really?
b) iterator is broken; list should be locked in ->start(), unlocked in ->stop() and *NOT* unlocked/relocked in ->next()
c) ->show() ought to do nothing in case of ->device == NULL, instead of skipping those in ->next()/->start()
Quoted 7 lines
d) regardless of the merits of the bright idea about asterisk at that line in output *and* regardless of (a), the implementation is not only atrociously ugly, it's actually very likely to be a roothole. Verifying that Cthulhu knows what number happens to be address of a
tty_structby blindly dereferencing memory at that address... Ouch.Please revert that crap.
I'll revert it and send the pull request to Linus.
Sorry about this.
greg k-h
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 30 lines · Greg KH
Quoted 29 lines · Al Viro
Quoted 9 lines · Jiri Slaby
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Well, our complains are
-ETOOLATE-- it's commitf4a3e0bceb57466cupstream. So please fix this up.FVO "fix" equal to "revert". Belated review:
a) global variable depending on stdin of the last opener? Affecting output of read(2)? Really?
b) iterator is broken; list should be locked in ->start(), unlocked in ->stop() and *NOT* unlocked/relocked in ->next()
c) ->show() ought to do nothing in case of ->device == NULL, instead of skipping those in ->next()/->start()
d) regardless of the merits of the bright idea about asterisk at that line in output *and* regardless of (a), the implementation is not only atrociously ugly, it's actually very likely to be a roothole. Verifying that Cthulhu knows what number happens to be address of a
tty_structby blindly dereferencing memory at that address... Ouch.
Quoted 3 lines
Quoted 1 line
Please revert that crap.
I'll revert it and send the pull request to Linus.
Odd:
> git revert f4a3e0bceb57466c Finished one revert.
# On branch master
nothing to commit (working directory clean)
Um, what just happened, I don't seem to be able to revert this patch. Did something change with git revert recently? I'm using:
> git --version git version 1.7.2
Any ideas?
greg k-h
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 41 lines · Greg KH
Quoted 30 lines · Greg KH
Quoted 29 lines · Al Viro
Quoted 9 lines · Jiri Slaby
Quoted 6 lines
Please, don't. Even leaving aside the fact that it's mind-bogglingly broken (->private_data can be _ANYTHING_, including arbitrary number cast to pointer), you really shouldn't screw your way through the descriptor table in the first place.
Strongly NACKed.
Well, our complains are
-ETOOLATE-- it's commitf4a3e0bceb57466cupstream. So please fix this up.FVO "fix" equal to "revert". Belated review:
a) global variable depending on stdin of the last opener? Affecting output of read(2)? Really?
b) iterator is broken; list should be locked in ->start(), unlocked in ->stop() and *NOT* unlocked/relocked in ->next()
c) ->show() ought to do nothing in case of ->device == NULL, instead of skipping those in ->next()/->start()
d) regardless of the merits of the bright idea about asterisk at that line in output *and* regardless of (a), the implementation is not only atrociously ugly, it's actually very likely to be a roothole. Verifying that Cthulhu knows what number happens to be address of a
tty_structby blindly dereferencing memory at that address... Ouch.Quoted 3 lines
Quoted 1 line
Please revert that crap.
I'll revert it and send the pull request to Linus.
Odd:
> git revertf4a3e0bceb57466cFinished one revert.
# On branch master
nothing to commit (working directory clean)
Quoted 6 lines
Um, what just happened, I don't seem to be able to revert this patch. Did something change with git revert recently? I'm using:
> git --version git version 1.7.2Any ideas?
Ah, it's because Linus already reverted it. Odd that git didn't tell me that somehow.
Anyway, all is good now, sorry for the noise.
greg k-h
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Jiri SlabyQuoted 29 lines · Jiri Slaby
Quoted 13 lines · Greg Kroah-Hartman
fs/proc/proc_tty.c +13
-0+/* +* Used for open /proc/tty/consoles. Before this detect +* the device ID of file descriptor 0 of the current +* reading task if a character device... +*/ +static int tty_consoles_open (struct inode *inode,struct file *file) +{ +struct files_struct *curfiles; + + current_dev =0 ; + curfiles =get_files_struct (current); +if (curfiles) { +const struct file *curfp;fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 276
Quoted 10 lines
fs/proc/proc_tty.c +10
-0+spin_lock (&curfiles->file_lock); + curfp =fcheck_files (curfiles,0 ); +if (curfp && curfp->private_data) { +const struct inode *inode; +dget (curfp->f_dentry); + inode = curfp->f_dentry->d_inode; +if (S_ISCHR (inode->i_mode)) { +struct tty_struct *tty; + tty = (struct tty_struct *)curfp->private_data; +if (tty && tty->magic ==TTY_MAGIC ) {Ah, I've just understood what this code does. It seems, that the 'tty' at this point may be already freed (e.g. people don't set
private_datato NULL). Please explain in the code why it can't...
Quoted 2 lines
Maybe I wouldn't bother with marking the "current" console by star at all as it seems not to pay off.
This is the main reason for what I've done this patch:
To see on which console line the reading process is located. Please do not skip this part as this is currently the only way to detect the real console below /dev/console ... it could be used in user space: e.g. in plymouth or bootlogd (to deterime the main console) or sulogin (to be able to provide a prompt on all console lines).
Quoted 12 lines
fs/proc/proc_tty.c static const struct file_operations proc_tty_drivers_operations = { · line 287
Quoted 12 lines
fs/proc/proc_tty.c +11
-0+ tty =tty_pair_get_tty (tty); + current_dev =tty_devnum (tty); + } + } +dput (curfp->f_dentry); + } +spin_unlock (&curfiles->file_lock); +put_files_struct (curfiles); + } +return seq_open (file, &tty_consoles_op); +}
Werner
Signature · 2 lines
"Having a smoking section in a restaurant is like having
a peeing section in a swimming pool." -- Edward BurrRe: [PATCH 08/49] ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
In reply to Greg Kroah-HartmanQuoted 5 lines · Greg Kroah-Hartman
From: Jeff Mahoney <[email protected]>
This patch converts cris to use
asm-generic/ioctls.hinstead of its own version.
Quoted 7 lines
The differences between the arch-specific version and the generic version are as follows:
- CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485, kept in arch-specific portion
- CRIS defines a different value for TIOCSRS485, kept via ifndef in generic
- The generic version adds support for termiox
Excellent, looks great.
Quoted 123 lines
Cc Mikael Starvik <[email protected]>Signed-off-by Jeff Mahoney <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- arch/cris/include/asm/ioctls.h | 84 +--------------------------------------- include/asm-generic/ioctls.h | 2 + 2 files changed, 3 insertions(+), 83 deletions(-)arch/cris/include/asm/ioctls.h +1
-83@@ -1,93 +1,11 @@#ifndef __ARCH_CRIS_IOCTLS_H__#define __ARCH_CRIS_IOCTLS_H__ -/* verbatim copy of asm-i386/ioctls.h */ - -#include <asm/ioctl.h> - -/* 0x54 is just a magic number to make these relatively unique ('T') */ - -#define TCGETS 0x5401 -#define TCSETS 0x5402 -#define TCSETSW 0x5403 -#define TCSETSF 0x5404 -#define TCGETA 0x5405 -#define TCSETA 0x5406 -#define TCSETAW 0x5407 -#define TCSETAF 0x5408 -#define TCSBRK 0x5409 -#define TCXONC 0x540A -#define TCFLSH 0x540B -#define TIOCEXCL 0x540C -#define TIOCNXCL 0x540D -#define TIOCSCTTY 0x540E -#define TIOCGPGRP 0x540F -#define TIOCSPGRP 0x5410 -#define TIOCOUTQ 0x5411 -#define TIOCSTI 0x5412 -#define TIOCGWINSZ 0x5413 -#define TIOCSWINSZ 0x5414 -#define TIOCMGET 0x5415 -#define TIOCMBIS 0x5416 -#define TIOCMBIC 0x5417 -#define TIOCMSET 0x5418 -#define TIOCGSOFTCAR 0x5419 -#define TIOCSSOFTCAR 0x541A -#define FIONREAD 0x541B -#define TIOCINQ FIONREAD -#define TIOCLINUX 0x541C -#define TIOCCONS 0x541D -#define TIOCGSERIAL 0x541E -#define TIOCSSERIAL 0x541F -#define TIOCPKT 0x5420 -#define FIONBIO 0x5421 -#define TIOCNOTTY 0x5422 -#define TIOCSETD 0x5423 -#define TIOCGETD 0x5424 -#define TCSBRKP 0x5425/* Needed for POSIX tcsendbreak() */ -#define TIOCSBRK 0x5427/* BSD compatibility */ -#define TIOCCBRK 0x5428/* BSD compatibility */ -#define TIOCGSID 0x5429/* Return the session ID of FD */ -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) -#define TCSETSW2 _IOW('T',0x2C, struct termios2) -#define TCSETSF2 _IOW('T',0x2D, struct termios2) -#define TIOCGPTN _IOR('T',0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ -#define TIOCSPTLCK _IOW('T',0x31, int)/* Lock/unlock Pty */ -#define TIOCSIG _IOW('T',0x36, int)/* Generate signal on Pty slave */ - -#define FIONCLEX 0x5450/* these numbers need to be adjusted. */ -#define FIOCLEX 0x5451 -#define FIOASYNC 0x5452 -#define TIOCSERCONFIG 0x5453 -#define TIOCSERGWILD 0x5454 -#define TIOCSERSWILD 0x5455 -#define TIOCGLCKTRMIOS 0x5456 -#define TIOCSLCKTRMIOS 0x5457#define TIOCSERGSTRUCT 0x5458/* For debugging only */ -#define TIOCSERGETLSR 0x5459/* Get line status register */ -#define TIOCSERGETMULTI 0x545A/* Get multiport config */ -#define TIOCSERSETMULTI 0x545B/* Set multiport config */ - -#define TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ -#define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ -#define FIOQSIZE 0x5460 -#define TIOCSERSETRS485 0x5461/* enable rs-485 (deprecated) */ #define TIOCSERWRRS485 0x5462/* write rs-485 */ #define TIOCSRS485 0x5463/* enable rs-485 */ -#define TIOCGRS485 0x542E/* get rs-485 */ - -/* Used for packet mode */ -#define TIOCPKT_DATA 0 -#define TIOCPKT_FLUSHREAD 1 -#define TIOCPKT_FLUSHWRITE 2 -#define TIOCPKT_STOP 4 -#define TIOCPKT_START 8 -#define TIOCPKT_NOSTOP 16 -#define TIOCPKT_DOSTOP 32 -#define TIOCPKT_IOCTL 64 -#define TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#include <asm-generic/ioctls.h> #endif include/asm-generic/ioctls.h +2
-0@@ -62,7 +62,9 @@#define TCSETSW2 _IOW('T', 0x2C, struct termios2)#define TCSETSF2 _IOW('T', 0x2D, struct termios2)#define TIOCGRS485 0x542E +#ifndef TIOCSRS485 #define TIOCSRS485 0x542F +#endif #define TIOCGPTN _IOR('T', 0x30, unsigned int)/* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T', 0x31, int)/* Lock/unlock Pty */ #define TCGETX 0x5432/* SYS5 TCGETX compatibility */ Signature · 1 line
1.7.2
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
In reply to Dr. Werner FinkQuoted 11 lines · Dr. Werner Fink
Quoted 2 lines
Maybe I wouldn't bother with marking the "current" console by star at all as it seems not to pay off.
This is the main reason for what I've done this patch:
To see on which console line the reading process is located. Please do not skip this part as this is currently the only way to detect the real console below/dev/console... it could be used in user space: e.g. in plymouth or bootlogd (to deterime the main console) or sulogin (to be able to provide a prompt on all console lines).
You've got to be kidding. So all this stuff is about getting TIOCGDEV into the mainline? In a form that would, presumably, be more acceptable than an ioctl?
Quoted 3 lines
Signature · 2 lines
"Having a smoking section in a restaurant is like having a peeing section in a swimming pool." -- Edward Burr
Ironic, innit?
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 13 lines · Al Viro
Quoted 11 lines · Dr. Werner Fink
Quoted 2 lines
Maybe I wouldn't bother with marking the "current" console by star at all as it seems not to pay off.
This is the main reason for what I've done this patch:
To see on which console line the reading process is located. Please do not skip this part as this is currently the only way to detect the real console below/dev/console... it could be used in user space: e.g. in plymouth or bootlogd (to deterime the main console) or sulogin (to be able to provide a prompt on all console lines).
Quoted 3 lines
You've got to be kidding. So all this stuff is about getting TIOCGDEV into the mainline? In a form that would, presumably, be more acceptable than an ioctl?
What is kidding about this user space problem? Currently there is no way to detect the terminal lines used for the system console. Running on /dev/console an application has to steal the controlling tty to detect the preferred terminal line of the system console (and only the preferred line). Last week the author of systemd had asked me why the TIOCGDEV patch was not send upstream. I've told him that this was done but that several patches were never accepted upstream, compare with:
http://lkml.org/lkml/2000/12/15/160
and the follow ups there. Even more the author of the old SysVinit had run into the same problem:
http://lkml.org/lkml/1998/3/21/57
It seems to me that the list of the terminal devices of the system consoles are useful in user space as Randy Dunlap tolds me here
http://article.gmane.org/gmane.linux.kernel.api/1653
Such a list would be very helpful e.g. to extend sulogin to be able to prompt for maintenance on all terminal lines of the system console after e.g. failed fsck. Currently only the preferred terminal line is prompted for maintenance.
Quoted 5 lines
Quoted 3 lines
Signature · 2 lines
"Having a smoking section in a restaurant is like having a peeing section in a swimming pool." -- Edward BurrIronic, innit?
depends on ;)
Werner
Signature · 1 line
System V style init programs - http://savannah.nongnu.org/projects/sysvinit/
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 4 lines · Dr. Werner Fink
Such a list would be very helpful e.g. to extend sulogin to be able to prompt for maintenance on all terminal lines of the system console after e.g. failed fsck. Currently only the preferred terminal line is prompted for maintenance.
I think nobody objects to the /proc/tty/consoles. This is a good thing to have. The patch just needs to be fixed (and you already did and sent me in private).
The objections are against the way how you find out the real tty behind /dev/console. The method to walk through fd, guessing private_data etc. is simply unacceptable.
Actually couldn't you just use one of:
1) ttyprintk driver (well, this will insert mess into klog)
2) send the output to all enabled consoles in /proc/tty/consoles ?
regards,
Signature · 2 lines
js suse labs
Re: [PATCH 28/49] tty: Add a new file /proc/tty/consoles
Quoted 10 lines · Jiri Slaby
Quoted 4 lines · Dr. Werner Fink
Such a list would be very helpful e.g. to extend sulogin to be able to prompt for maintenance on all terminal lines of the system console after e.g. failed fsck. Currently only the preferred terminal line is prompted for maintenance.
I think nobody objects to the
/proc/tty/consoles. This is a good thing to have. The patch just needs to be fixed (and you already did and sent me in private).
Quoted 8 lines
The objections are against the way how you find out the real tty behind
/dev/console. The method to walk through fd, guessingprivate_dataetc. is simply unacceptable.Actually couldn't you just use one of:
1) ttyprintk driver (well, this will insert mess into klog)
2) send the output to all enabled consoles in/proc/tty/consoles?
Hmmm ... I've wonder about the comment on add_preferred_console() of kernel/printk.c:
* add_preferred_console - add a device to the list of preferred consoles.
* @name: device name
* @idx: device index
* @options: options for this console
*
* The last preferred console added will be used for kernel messages
* and stdin/out/err for init. Normally this is used by console_setup
* above to handle user-supplied console arguments; however it can also
* be used by arch-specific code either to override the user or more
* commonly to provide a default console (ie from PROM variables) when
* the user has not supplied one.
that is that the first line always provides the preferred terminal line. In other words the detection stuff is not required as long as the statement in the comment for add_preferred_console() will remain now and in future. Indeed register_console() reorders the list of console drivers if the preferred terminal line will be changed and this line is marked with the flag CON_CONSDEV.
Now as stdin/out/err for init resides on the preferred terminal line this could be OK. If a program is runniung on /dev/console then also its stdin is directed to the preferred console line.
Werner
Signature · 1 line
System V style init programs - http://savannah.nongnu.org/projects/sysvinit/
Quoted 1 line
From
f1c9b9a6d589dfdf85961fe3f8db4cdc9600dc4bMon Sep 17 00:00:00 2001
From: Werner Fink <[email protected]>
Date: Wed, 27 Oct 2010 13:25:26 +0200
Subject: [PATCH] tty: Add a new file /proc/tty/consoles
Add a new file /proc/tty/consoles to be able to determine the registered system console lines. If the reading process holds /dev/console open at the regular standard input stream the active device will be marked by an asterisk. Show possible operations and also decode the used flags of the of the listed console lines.
Documentation/filesystems/proc.txt +33 -0
@@ -1074,6 +1074,7 @@ Table 1-11: Files in /proc/tty drivers list of drivers and their usage ldiscs registered line disciplines driver/serial usage statistic and status of single tty lines + consoles registered system console lines .............................................................................. To see which tty's are currently in use, you can simply look into the file
@@ -1092,6 +1093,38 @@ To see which tty's are currently in use, you can simply look into the file /dev/tty /dev/tty 5 0 system:/dev/tty unknown /dev/tty 4 1-63 console +To see which character device lines are currently used for the system console +/dev/console, you may simply look into the file /proc/tty/consoles: + + > cat /proc/tty/consoles + tty0 -WU (ECp) 4:7 + ttyS0 -W- (Ep) 4:64 + +The columns are: + + device name of the device + operations R = can do read operations + W = can do write operations + U = can do unblank + flags E = it is enabled + C = it is prefered console + B = it is primary boot console + p = it is used for printk buffer + b = it is not a TTY but a Braille device + a = it is safe to use when cpu is offline + * = it is tty line of the reading process + + = it is controlling tty of the reading process + major:minor major and minor number of the device separated by a colon + +If the reading process holds /dev/console open at the regular standard input +stream the active device will be marked by an asterisk: + + > cat /proc/tty/consoles < /dev/console + tty0 -WU (ECp*) 4:7 + ttyS0 -W- (Ep) 4:64 + > tty + /dev/pts/3 + 1.8 Miscellaneous kernel statistics in /proc/stat -------------------------------------------------
fs/proc/proc_tty.c +168 -0
185 lines not on this page · raw message
Signature · 1 line
1.6.0.2
Re: [PATCH 29/49] vcs: add poll/fasync support
In reply to Greg Kroah-HartmanQuoted 10 lines · Greg Kroah-Hartman
From: Nicolas Pitre <[email protected]>
The
/dev/vcs*devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from/dev/vcsa0whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.
Quoted 5 lines
To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the
/dev/vcs*devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the lastread()operation. The application still has tolseek()back as usual in order toread()the new data.
Shouldn't it raise POLLPRI/POLLERR then, when it's not about new data to read? We do this for several files in the kernel where we just want to wakup someone, but the pretty well-defined semantics of poll() don't apply.
Kay
Re: [PATCH 29/49] vcs: add poll/fasync support
Quoted 17 lines · Kay Sievers
Quoted 10 lines · Greg Kroah-Hartman
From: Nicolas Pitre <[email protected]>
The
/dev/vcs*devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from/dev/vcsa0whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.Quoted 5 lines
To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the
/dev/vcs*devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the lastread()operation. The application still has tolseek()back as usual in order toread()the new data.
Quoted 4 lines
Shouldn't it raise POLLPRI/POLLERR then, when it's not about new data to read? We do this for several files in the kernel where we just want to wakup someone, but the pretty well-defined semantics of
poll()don't apply.
Hmmm... Maybe POLLPRI, but POLLERR makes no sense.
Nicolas
Re: [PATCH 29/49] vcs: add poll/fasync support
Quoted 19 lines · Nicolas Pitre
Quoted 17 lines · Kay Sievers
Quoted 15 lines · Greg Kroah-Hartman
From: Nicolas Pitre <[email protected]>
The
/dev/vcs*devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from/dev/vcsa0whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the
/dev/vcs*devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the lastread()operation. The application still has tolseek()back as usual in order toread()the new data.
Quoted 6 lines
Quoted 4 lines
Shouldn't it raise POLLPRI/POLLERR then, when it's not about new data to read? We do this for several files in the kernel where we just want to wakup someone, but the pretty well-defined semantics of
poll()don't apply.Hmmm... Maybe POLLPRI, but POLLERR makes no sense.
I have no opinion about that, but it's what others do:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4508a7a734b111b8b7e39986237d84acb1168dd0
The POLLIN should definitely go, it's POSIX defined. What we do here is more like an error that wakes up than a stream data to read. :)
Kay
Re: [PATCH 29/49] vcs: add poll/fasync support
Quoted 26 lines · Kay Sievers
Quoted 24 lines · Nicolas Pitre
Quoted 21 lines · Kay Sievers
Quoted 10 lines · Greg Kroah-Hartman
From: Nicolas Pitre <[email protected]>
The
/dev/vcs*devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from/dev/vcsa0whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.Quoted 5 lines
To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the
/dev/vcs*devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the lastread()operation. The application still has tolseek()back as usual in order toread()the new data.Shouldn't it raise POLLPRI/POLLERR then, when it's not about new data to read? We do this for several files in the kernel where we just want to wakup someone, but the pretty well-defined semantics of
poll()don't apply.
Quoted 8 lines
Quoted 1 line
Hmmm... Maybe POLLPRI, but POLLERR makes no sense.
I have no opinion about that, but it's what others do:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4508a7a734b111b8b7e39986237d84acb1168dd0The POLLIN should definitely go, it's POSIX defined. What we do here is more like an error that wakes up than a stream data to read. :)
OK. What about this then?
----- >8
Subject: [PATCH] vcs: make proper usage of the poll flags
Kay Sievers pointed out that usage of POLLIN is well defined by POSIX, and the current usage here doesn't follow that definition. So let's duplicate the same semantics as implemented by sysfs_poll() instead.
---
drivers/tty/vt/vc_screen.c +3 -3
@@ -553,12 +553,12 @@ static unsigned int vcs_poll(struct file *file, poll_table *wait) { struct vcs_poll_data *poll = vcs_poll_data_get(file); -int ret =0 ; +int ret =DEFAULT_POLLMASK |POLLERR |POLLPRI ;if (poll) {poll_wait (file, &poll->waitq, wait); -if (!poll->seen_last_update) - ret =POLLIN |POLLRDNORM ; +if (poll->seen_last_update) + ret =DEFAULT_POLLMASK ; }return ret; }
Re: [PATCH 29/49] vcs: add poll/fasync support
Quoted 57 lines · Nicolas Pitre
Quoted 26 lines · Kay Sievers
Quoted 24 lines · Nicolas Pitre
Quoted 21 lines · Kay Sievers
Quoted 10 lines · Greg Kroah-Hartman
From: Nicolas Pitre <[email protected]>
The
/dev/vcs*devices are used, amongst other things, by accessibility applications such as BRLTTY to display the screen content onto refreshable braille displays. Currently this is performed by constantly reading from/dev/vcsa0whether or not the screen content has changed. Given the default braille refresh rate of 25 times per second, this easily qualifies as the biggest source of wake-up events preventing laptops from entering deeper power saving states.Quoted 5 lines
To avoid this periodic polling, let's add support for select()/poll() and SIGIO with the
/dev/vcs*devices. The implemented semantic is to report data availability whenever the corresponding vt has seen some update after the lastread()operation. The application still has tolseek()back as usual in order toread()the new data.Shouldn't it raise POLLPRI/POLLERR then, when it's not about new data to read? We do this for several files in the kernel where we just want to wakup someone, but the pretty well-defined semantics of
poll()don't apply.Quoted 8 lines
Quoted 1 line
Hmmm... Maybe POLLPRI, but POLLERR makes no sense.
I have no opinion about that, but it's what others do:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4508a7a734b111b8b7e39986237d84acb1168dd0The POLLIN should definitely go, it's POSIX defined. What we do here is more like an error that wakes up than a stream data to read. :)
OK. What about this then?
----- >8
Subject: [PATCH] vcs: make proper usage of the poll flagsKay Sievers pointed out that usage of POLLIN is well defined by POSIX, and the current usage here doesn't follow that definition. So let's duplicate the same semantics as implemented by
sysfs_poll()instead.Signed-off-by Nicolas Pitre <[email protected]>---
drivers/tty/vt/vc_screen.c +1
-1@@ -553,12 +553,12 @@ static unsigned int vcs_poll(struct file *file, poll_table *wait) { struct vcs_poll_data *poll = vcs_poll_data_get(file); - int ret = 0; + int ret = DEFAULT_POLLMASK|POLLERR|POLLPRI;
drivers/tty/vt/vc_screen.c static unsigned int · line 564
Quoted 10 lines
drivers/tty/vt/vc_screen.c +2
-2if (poll) { poll_wait(file, &poll->waitq, wait); - if (!poll->seen_last_update) - ret = POLLIN | POLLRDNORM; + if (poll->seen_last_update) + ret = DEFAULT_POLLMASK; } return ret; }
Looks good to me.
Kay