33f0f88f1c
The API and code have been through various bits of initial review by serial driver people but they definitely need to live somewhere for a while so the unconverted drivers can get knocked into shape, existing drivers that have been updated can be better tuned and bugs whacked out. This replaces the tty flip buffers with kmalloc objects in rings. In the normal situation for an IRQ driven serial port at typical speeds the behaviour is pretty much the same, two buffers end up allocated and the kernel cycles between them as before. When there are delays or at high speed we now behave far better as the buffer pool can grow a bit rather than lose characters. This also means that we can operate at higher speeds reliably. For drivers that receive characters in blocks (DMA based, USB and especially virtualisation) the layer allows a lot of driver specific code that works around the tty layer with private secondary queues to be removed. The IBM folks need this sort of layer, the smart serial port people do, the virtualisers do (because a virtualised tty typically operates at infinite speed rather than emulating 9600 baud). Finally many drivers had invalid and unsafe attempts to avoid buffer overflows by directly invoking tty methods extracted out of the innards of work queue structs. These are no longer needed and all go away. That fixes various random hangs with serial ports on overflow. The other change in here is to optimise the receive_room path that is used by some callers. It turns out that only one ldisc uses receive room except asa constant and it updates it far far less than the value is read. We thus make it a variable not a function call. I expect the code to contain bugs due to the size alone but I'll be watching and squashing them and feeding out new patches as it goes. Because the buffers now dynamically expand you should only run out of buffering when the kernel runs out of memory for real. That means a lot of the horrible hacks high performance drivers used to do just aren't needed any more. Description: tty_insert_flip_char is an old API and continues to work as before, as does tty_flip_buffer_push() [this is why many drivers dont need modification]. It does now also return the number of chars inserted There are also tty_buffer_request_room(tty, len) which asks for a buffer block of the length requested and returns the space found. This improves efficiency with hardware that knows how much to transfer. and tty_insert_flip_string_flags(tty, str, flags, len) to insert a string of characters and flags For a smart interface the usual code is len = tty_request_buffer_room(tty, amount_hardware_says); tty_insert_flip_string(tty, buffer_from_card, len); More description! At the moment tty buffers are attached directly to the tty. This is causing a lot of the problems related to tty layer locking, also problems at high speed and also with bursty data (such as occurs in virtualised environments) I'm working on ripping out the flip buffers and replacing them with a pool of dynamically allocated buffers. This allows both for old style "byte I/O" devices and also helps virtualisation and smart devices where large blocks of data suddenely materialise and need storing. So far so good. Lots of drivers reference tty->flip.*. Several of them also call directly and unsafely into function pointers it provides. This will all break. Most drivers can use tty_insert_flip_char which can be kept as an API but others need more. At the moment I've added the following interfaces, if people think more will be needed now is a good time to say int tty_buffer_request_room(tty, size) Try and ensure at least size bytes are available, returns actual room (may be zero). At the moment it just uses the flipbuf space but that will change. Repeated calls without characters being added are not cumulative. (ie if you call it with 1, 1, 1, and then 4 you'll have four characters of space. The other functions will also try and grow buffers in future but this will be a more efficient way when you know block sizes. int tty_insert_flip_char(tty, ch, flag) As before insert a character if there is room. Now returns 1 for success, 0 for failure. int tty_insert_flip_string(tty, str, len) Insert a block of non error characters. Returns the number inserted. int tty_prepare_flip_string(tty, strptr, len) Adjust the buffer to allow len characters to be added. Returns a buffer pointer in strptr and the length available. This allows for hardware that needs to use functions like insl or mencpy_fromio. Signed-off-by: Alan Cox <alan@redhat.com> Cc: Paul Fulghum <paulkf@microgate.com> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: John Hawkes <hawkes@sgi.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
253 lines
6.1 KiB
C
253 lines
6.1 KiB
C
/*
|
|
* Input device TTY line discipline
|
|
*
|
|
* Copyright (c) 1999-2002 Vojtech Pavlik
|
|
*
|
|
* This is a module that converts a tty line into a much simpler
|
|
* 'serial io port' abstraction that the input device drivers use.
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*/
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/serio.h>
|
|
#include <linux/tty.h>
|
|
|
|
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
|
|
MODULE_DESCRIPTION("Input device TTY line discipline");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS_LDISC(N_MOUSE);
|
|
|
|
#define SERPORT_BUSY 1
|
|
#define SERPORT_ACTIVE 2
|
|
#define SERPORT_DEAD 3
|
|
|
|
struct serport {
|
|
struct tty_struct *tty;
|
|
wait_queue_head_t wait;
|
|
struct serio *serio;
|
|
struct serio_device_id id;
|
|
spinlock_t lock;
|
|
unsigned long flags;
|
|
};
|
|
|
|
/*
|
|
* Callback functions from the serio code.
|
|
*/
|
|
|
|
static int serport_serio_write(struct serio *serio, unsigned char data)
|
|
{
|
|
struct serport *serport = serio->port_data;
|
|
return -(serport->tty->driver->write(serport->tty, &data, 1) != 1);
|
|
}
|
|
|
|
static int serport_serio_open(struct serio *serio)
|
|
{
|
|
struct serport *serport = serio->port_data;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&serport->lock, flags);
|
|
set_bit(SERPORT_ACTIVE, &serport->flags);
|
|
spin_unlock_irqrestore(&serport->lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void serport_serio_close(struct serio *serio)
|
|
{
|
|
struct serport *serport = serio->port_data;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&serport->lock, flags);
|
|
clear_bit(SERPORT_ACTIVE, &serport->flags);
|
|
set_bit(SERPORT_DEAD, &serport->flags);
|
|
spin_unlock_irqrestore(&serport->lock, flags);
|
|
|
|
wake_up_interruptible(&serport->wait);
|
|
}
|
|
|
|
/*
|
|
* serport_ldisc_open() is the routine that is called upon setting our line
|
|
* discipline on a tty. It prepares the serio struct.
|
|
*/
|
|
|
|
static int serport_ldisc_open(struct tty_struct *tty)
|
|
{
|
|
struct serport *serport;
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
|
|
serport = kzalloc(sizeof(struct serport), GFP_KERNEL);
|
|
if (!serport)
|
|
return -ENOMEM;
|
|
|
|
serport->tty = tty;
|
|
spin_lock_init(&serport->lock);
|
|
init_waitqueue_head(&serport->wait);
|
|
|
|
tty->disc_data = serport;
|
|
tty->receive_room = 256;
|
|
set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* serport_ldisc_close() is the opposite of serport_ldisc_open()
|
|
*/
|
|
|
|
static void serport_ldisc_close(struct tty_struct *tty)
|
|
{
|
|
struct serport *serport = (struct serport *) tty->disc_data;
|
|
|
|
kfree(serport);
|
|
}
|
|
|
|
/*
|
|
* serport_ldisc_receive() is called by the low level tty driver when characters
|
|
* are ready for us. We forward the characters, one by one to the 'interrupt'
|
|
* routine.
|
|
*
|
|
* FIXME: We should get pt_regs from the tty layer and forward them to
|
|
* serio_interrupt here.
|
|
*/
|
|
|
|
static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
|
|
{
|
|
struct serport *serport = (struct serport*) tty->disc_data;
|
|
unsigned long flags;
|
|
int i;
|
|
|
|
spin_lock_irqsave(&serport->lock, flags);
|
|
|
|
if (!test_bit(SERPORT_ACTIVE, &serport->flags))
|
|
goto out;
|
|
|
|
for (i = 0; i < count; i++)
|
|
serio_interrupt(serport->serio, cp[i], 0, NULL);
|
|
|
|
out:
|
|
spin_unlock_irqrestore(&serport->lock, flags);
|
|
}
|
|
|
|
/*
|
|
* serport_ldisc_read() just waits indefinitely if everything goes well.
|
|
* However, when the serio driver closes the serio port, it finishes,
|
|
* returning 0 characters.
|
|
*/
|
|
|
|
static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, unsigned char __user * buf, size_t nr)
|
|
{
|
|
struct serport *serport = (struct serport*) tty->disc_data;
|
|
struct serio *serio;
|
|
char name[64];
|
|
|
|
if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
|
|
return -EBUSY;
|
|
|
|
serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
|
|
if (!serio)
|
|
return -ENOMEM;
|
|
|
|
strlcpy(serio->name, "Serial port", sizeof(serio->name));
|
|
snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty, name));
|
|
serio->id = serport->id;
|
|
serio->id.type = SERIO_RS232;
|
|
serio->write = serport_serio_write;
|
|
serio->open = serport_serio_open;
|
|
serio->close = serport_serio_close;
|
|
serio->port_data = serport;
|
|
|
|
serio_register_port(serport->serio);
|
|
printk(KERN_INFO "serio: Serial port %s\n", tty_name(tty, name));
|
|
|
|
wait_event_interruptible(serport->wait, test_bit(SERPORT_DEAD, &serport->flags));
|
|
serio_unregister_port(serport->serio);
|
|
serport->serio = NULL;
|
|
|
|
clear_bit(SERPORT_DEAD, &serport->flags);
|
|
clear_bit(SERPORT_BUSY, &serport->flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* serport_ldisc_ioctl() allows to set the port protocol, and device ID
|
|
*/
|
|
|
|
static int serport_ldisc_ioctl(struct tty_struct * tty, struct file * file, unsigned int cmd, unsigned long arg)
|
|
{
|
|
struct serport *serport = (struct serport*) tty->disc_data;
|
|
unsigned long type;
|
|
|
|
if (cmd == SPIOCSTYPE) {
|
|
if (get_user(type, (unsigned long __user *) arg))
|
|
return -EFAULT;
|
|
|
|
serport->id.proto = type & 0x000000ff;
|
|
serport->id.id = (type & 0x0000ff00) >> 8;
|
|
serport->id.extra = (type & 0x00ff0000) >> 16;
|
|
|
|
return 0;
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void serport_ldisc_write_wakeup(struct tty_struct * tty)
|
|
{
|
|
struct serport *serport = (struct serport *) tty->disc_data;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&serport->lock, flags);
|
|
if (test_bit(SERPORT_ACTIVE, &serport->flags))
|
|
serio_drv_write_wakeup(serport->serio);
|
|
spin_unlock_irqrestore(&serport->lock, flags);
|
|
}
|
|
|
|
/*
|
|
* The line discipline structure.
|
|
*/
|
|
|
|
static struct tty_ldisc serport_ldisc = {
|
|
.owner = THIS_MODULE,
|
|
.name = "input",
|
|
.open = serport_ldisc_open,
|
|
.close = serport_ldisc_close,
|
|
.read = serport_ldisc_read,
|
|
.ioctl = serport_ldisc_ioctl,
|
|
.receive_buf = serport_ldisc_receive,
|
|
.write_wakeup = serport_ldisc_write_wakeup
|
|
};
|
|
|
|
/*
|
|
* The functions for insering/removing us as a module.
|
|
*/
|
|
|
|
static int __init serport_init(void)
|
|
{
|
|
int retval;
|
|
retval = tty_register_ldisc(N_MOUSE, &serport_ldisc);
|
|
if (retval)
|
|
printk(KERN_ERR "serport.c: Error registering line discipline.\n");
|
|
|
|
return retval;
|
|
}
|
|
|
|
static void __exit serport_exit(void)
|
|
{
|
|
tty_unregister_ldisc(N_MOUSE);
|
|
}
|
|
|
|
module_init(serport_init);
|
|
module_exit(serport_exit);
|