[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
/*
|
2007-10-16 08:26:43 +00:00
|
|
|
* Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
2005-04-16 22:20:36 +00:00
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
#include "linux/irqreturn.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
#include "linux/kd.h"
|
|
|
|
#include "chan_kern.h"
|
2007-10-16 08:26:43 +00:00
|
|
|
#include "irq_kern.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
#include "irq_user.h"
|
2008-02-05 06:30:46 +00:00
|
|
|
#include "kern_util.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
#include "os.h"
|
|
|
|
|
|
|
|
#define LINE_BUFSIZE 4096
|
|
|
|
|
2006-10-08 21:49:34 +00:00
|
|
|
static irqreturn_t line_interrupt(int irq, void *data)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
struct chan *chan = data;
|
|
|
|
struct line *line = chan->line;
|
|
|
|
struct tty_struct *tty = line->tty;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (line)
|
|
|
|
chan_interrupt(&line->chan_list, &line->task, tty, irq);
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
2006-12-07 04:31:36 +00:00
|
|
|
static void line_timer_cb(struct work_struct *work)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2006-12-07 04:31:36 +00:00
|
|
|
struct line *line = container_of(work, struct line, task.work);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->throttled)
|
2006-01-06 08:18:58 +00:00
|
|
|
chan_interrupt(&line->chan_list, &line->task, line->tty,
|
|
|
|
line->driver->read_irq);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* Returns the free space inside the ring buffer of this line.
|
2005-05-01 15:58:56 +00:00
|
|
|
*
|
2007-10-19 23:23:03 +00:00
|
|
|
* Should be called while holding line->lock (this does not modify data).
|
2005-05-01 15:58:56 +00:00
|
|
|
*/
|
|
|
|
static int write_room(struct line *line)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
if (line->buffer == NULL)
|
|
|
|
return LINE_BUFSIZE - 1;
|
|
|
|
|
|
|
|
/* This is for the case where the buffer is wrapped! */
|
|
|
|
n = line->head - line->tail;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (n <= 0)
|
2008-02-05 06:30:42 +00:00
|
|
|
n += LINE_BUFSIZE; /* The other case */
|
2005-05-01 15:58:56 +00:00
|
|
|
return n - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int line_write_room(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
unsigned long flags;
|
|
|
|
int room;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&line->lock, flags);
|
|
|
|
room = write_room(line);
|
|
|
|
spin_unlock_irqrestore(&line->lock, flags);
|
|
|
|
|
|
|
|
return room;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
int line_chars_in_buffer(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
unsigned long flags;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&line->lock, flags);
|
2008-02-05 06:30:42 +00:00
|
|
|
/* write_room subtracts 1 for the needed NULL, so we readd it.*/
|
2005-05-01 15:58:56 +00:00
|
|
|
ret = LINE_BUFSIZE - (write_room(line) + 1);
|
|
|
|
spin_unlock_irqrestore(&line->lock, flags);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This copies the content of buf into the circular buffer associated with
|
|
|
|
* this line.
|
|
|
|
* The return value is the number of characters actually copied, i.e. the ones
|
|
|
|
* for which there was space: this function is not supposed to ever flush out
|
|
|
|
* the circular buffer.
|
|
|
|
*
|
|
|
|
* Must be called while holding line->lock!
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static int buffer_data(struct line *line, const char *buf, int len)
|
|
|
|
{
|
|
|
|
int end, room;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->buffer == NULL) {
|
2005-04-16 22:20:36 +00:00
|
|
|
line->buffer = kmalloc(LINE_BUFSIZE, GFP_ATOMIC);
|
|
|
|
if (line->buffer == NULL) {
|
2007-10-16 08:26:43 +00:00
|
|
|
printk(KERN_ERR "buffer_data - atomic allocation "
|
|
|
|
"failed\n");
|
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
line->head = line->buffer;
|
|
|
|
line->tail = line->buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
room = write_room(line);
|
|
|
|
len = (len > room) ? room : len;
|
|
|
|
|
|
|
|
end = line->buffer + LINE_BUFSIZE - line->tail;
|
2005-05-01 15:58:56 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (len < end) {
|
2005-04-16 22:20:36 +00:00
|
|
|
memcpy(line->tail, buf, len);
|
|
|
|
line->tail += len;
|
2006-01-06 08:18:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2005-05-01 15:58:56 +00:00
|
|
|
/* The circular buffer is wrapping */
|
2005-04-16 22:20:36 +00:00
|
|
|
memcpy(line->tail, buf, end);
|
|
|
|
buf += end;
|
|
|
|
memcpy(line->buffer, buf, len - end);
|
|
|
|
line->tail = line->buffer + len - end;
|
|
|
|
}
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
return len;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
/*
|
|
|
|
* Flushes the ring buffer to the output channels. That is, write_chan is
|
|
|
|
* called, passing it line->head as buffer, and an appropriate count.
|
|
|
|
*
|
|
|
|
* On exit, returns 1 when the buffer is empty,
|
|
|
|
* 0 when the buffer is not empty on exit,
|
|
|
|
* and -errno when an error occurred.
|
|
|
|
*
|
|
|
|
* Must be called while holding line->lock!*/
|
2005-04-16 22:20:36 +00:00
|
|
|
static int flush_buffer(struct line *line)
|
|
|
|
{
|
|
|
|
int n, count;
|
|
|
|
|
|
|
|
if ((line->buffer == NULL) || (line->head == line->tail))
|
2005-05-01 15:58:56 +00:00
|
|
|
return 1;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (line->tail < line->head) {
|
2005-05-01 15:58:56 +00:00
|
|
|
/* line->buffer + LINE_BUFSIZE is the end of the buffer! */
|
2005-04-16 22:20:36 +00:00
|
|
|
count = line->buffer + LINE_BUFSIZE - line->head;
|
2005-05-01 15:58:56 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
n = write_chan(&line->chan_list, line->head, count,
|
|
|
|
line->driver->write_irq);
|
|
|
|
if (n < 0)
|
2005-05-01 15:58:56 +00:00
|
|
|
return n;
|
|
|
|
if (n == count) {
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* We have flushed from ->head to buffer end, now we
|
|
|
|
* must flush only from the beginning to ->tail.
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
line->head = line->buffer;
|
2005-05-01 15:58:56 +00:00
|
|
|
} else {
|
2005-04-16 22:20:36 +00:00
|
|
|
line->head += n;
|
2005-05-01 15:58:56 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
count = line->tail - line->head;
|
2006-01-06 08:18:50 +00:00
|
|
|
n = write_chan(&line->chan_list, line->head, count,
|
2005-04-16 22:20:36 +00:00
|
|
|
line->driver->write_irq);
|
2005-05-01 15:58:56 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (n < 0)
|
2005-05-01 15:58:56 +00:00
|
|
|
return n;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
line->head += n;
|
2005-05-01 15:58:56 +00:00
|
|
|
return line->head == line->tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
void line_flush_buffer(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
unsigned long flags;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&line->lock, flags);
|
|
|
|
err = flush_buffer(line);
|
|
|
|
spin_unlock_irqrestore(&line->lock, flags);
|
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* We map both ->flush_chars and ->put_char (which go in pair) onto
|
|
|
|
* ->flush_buffer and ->write. Hope it's not that bad.
|
|
|
|
*/
|
2005-05-01 15:58:56 +00:00
|
|
|
void line_flush_chars(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
line_flush_buffer(tty);
|
|
|
|
}
|
|
|
|
|
2008-05-07 03:42:33 +00:00
|
|
|
int line_put_char(struct tty_struct *tty, unsigned char ch)
|
2005-05-01 15:58:56 +00:00
|
|
|
{
|
2008-05-07 03:42:33 +00:00
|
|
|
return line_write(tty, &ch, sizeof(ch));
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int line_write(struct tty_struct *tty, const unsigned char *buf, int len)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
unsigned long flags;
|
2007-10-16 08:26:42 +00:00
|
|
|
int n, ret = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
spin_lock_irqsave(&line->lock, flags);
|
2007-10-16 08:26:42 +00:00
|
|
|
if (line->head != line->tail)
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = buffer_data(line, buf, len);
|
2007-10-16 08:26:42 +00:00
|
|
|
else {
|
2006-01-06 08:18:50 +00:00
|
|
|
n = write_chan(&line->chan_list, buf, len,
|
2005-04-16 22:20:36 +00:00
|
|
|
line->driver->write_irq);
|
2005-05-01 15:58:56 +00:00
|
|
|
if (n < 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
ret = n;
|
|
|
|
goto out_up;
|
|
|
|
}
|
|
|
|
|
|
|
|
len -= n;
|
|
|
|
ret += n;
|
2005-05-01 15:58:56 +00:00
|
|
|
if (len > 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
ret += buffer_data(line, buf + n, len);
|
|
|
|
}
|
2005-05-01 15:58:56 +00:00
|
|
|
out_up:
|
|
|
|
spin_unlock_irqrestore(&line->lock, flags);
|
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-12-08 10:38:45 +00:00
|
|
|
void line_set_termios(struct tty_struct *tty, struct ktermios * old)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
/* nothing */
|
|
|
|
}
|
|
|
|
|
2006-09-27 08:50:33 +00:00
|
|
|
static const struct {
|
2005-04-16 22:20:36 +00:00
|
|
|
int cmd;
|
|
|
|
char *level;
|
|
|
|
char *name;
|
|
|
|
} tty_ioctls[] = {
|
|
|
|
/* don't print these, they flood the log ... */
|
|
|
|
{ TCGETS, NULL, "TCGETS" },
|
2007-10-16 08:26:43 +00:00
|
|
|
{ TCSETS, NULL, "TCSETS" },
|
|
|
|
{ TCSETSW, NULL, "TCSETSW" },
|
|
|
|
{ TCFLSH, NULL, "TCFLSH" },
|
|
|
|
{ TCSBRK, NULL, "TCSBRK" },
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* general tty stuff */
|
2007-10-16 08:26:43 +00:00
|
|
|
{ TCSETSF, KERN_DEBUG, "TCSETSF" },
|
|
|
|
{ TCGETA, KERN_DEBUG, "TCGETA" },
|
|
|
|
{ TIOCMGET, KERN_DEBUG, "TIOCMGET" },
|
|
|
|
{ TCSBRKP, KERN_DEBUG, "TCSBRKP" },
|
|
|
|
{ TIOCMSET, KERN_DEBUG, "TIOCMSET" },
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* linux-specific ones */
|
|
|
|
{ TIOCLINUX, KERN_INFO, "TIOCLINUX" },
|
|
|
|
{ KDGKBMODE, KERN_INFO, "KDGKBMODE" },
|
|
|
|
{ KDGKBTYPE, KERN_INFO, "KDGKBTYPE" },
|
|
|
|
{ KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" },
|
|
|
|
};
|
|
|
|
|
|
|
|
int line_ioctl(struct tty_struct *tty, struct file * file,
|
|
|
|
unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
switch(cmd) {
|
|
|
|
#ifdef TIOCGETP
|
|
|
|
case TIOCGETP:
|
|
|
|
case TIOCSETP:
|
|
|
|
case TIOCSETN:
|
|
|
|
#endif
|
|
|
|
#ifdef TIOCGETC
|
|
|
|
case TIOCGETC:
|
|
|
|
case TIOCSETC:
|
|
|
|
#endif
|
|
|
|
#ifdef TIOCGLTC
|
|
|
|
case TIOCGLTC:
|
|
|
|
case TIOCSLTC:
|
|
|
|
#endif
|
|
|
|
case TCGETS:
|
|
|
|
case TCSETSF:
|
|
|
|
case TCSETSW:
|
|
|
|
case TCSETS:
|
|
|
|
case TCGETA:
|
|
|
|
case TCSETAF:
|
|
|
|
case TCSETAW:
|
|
|
|
case TCSETA:
|
|
|
|
case TCXONC:
|
|
|
|
case TCFLSH:
|
|
|
|
case TIOCOUTQ:
|
|
|
|
case TIOCINQ:
|
|
|
|
case TIOCGLCKTRMIOS:
|
|
|
|
case TIOCSLCKTRMIOS:
|
|
|
|
case TIOCPKT:
|
|
|
|
case TIOCGSOFTCAR:
|
|
|
|
case TIOCSSOFTCAR:
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
#if 0
|
|
|
|
case TCwhatever:
|
|
|
|
/* do something */
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
for (i = 0; i < ARRAY_SIZE(tty_ioctls); i++)
|
|
|
|
if (cmd == tty_ioctls[i].cmd)
|
|
|
|
break;
|
2007-10-16 08:26:43 +00:00
|
|
|
if (i == ARRAY_SIZE(tty_ioctls)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
printk(KERN_ERR "%s: %s: unknown ioctl: 0x%x\n",
|
2008-04-28 09:13:53 +00:00
|
|
|
__func__, tty->name, cmd);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
ret = -ENOIOCTLCMD;
|
|
|
|
break;
|
|
|
|
}
|
2005-05-01 15:58:56 +00:00
|
|
|
return ret;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-01-06 08:18:58 +00:00
|
|
|
void line_throttle(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
|
|
|
|
deactivate_chan(&line->chan_list, line->driver->read_irq);
|
|
|
|
line->throttled = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void line_unthrottle(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
|
|
|
|
line->throttled = 0;
|
|
|
|
chan_interrupt(&line->chan_list, &line->task, tty,
|
|
|
|
line->driver->read_irq);
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* Maybe there is enough stuff pending that calling the interrupt
|
2006-01-06 08:18:58 +00:00
|
|
|
* throttles us again. In this case, line->throttled will be 1
|
|
|
|
* again and we shouldn't turn the interrupt back on.
|
|
|
|
*/
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->throttled)
|
2006-01-06 08:18:58 +00:00
|
|
|
reactivate_chan(&line->chan_list, line->driver->read_irq);
|
|
|
|
}
|
|
|
|
|
2006-10-08 21:49:34 +00:00
|
|
|
static irqreturn_t line_write_interrupt(int irq, void *data)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
struct chan *chan = data;
|
|
|
|
struct line *line = chan->line;
|
|
|
|
struct tty_struct *tty = line->tty;
|
2005-04-16 22:20:36 +00:00
|
|
|
int err;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* Interrupts are disabled here because we registered the interrupt with
|
|
|
|
* IRQF_DISABLED (see line_setup_irq).
|
|
|
|
*/
|
2005-05-01 15:58:56 +00:00
|
|
|
|
2007-03-08 04:41:12 +00:00
|
|
|
spin_lock(&line->lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
err = flush_buffer(line);
|
2005-05-01 15:58:56 +00:00
|
|
|
if (err == 0) {
|
|
|
|
return IRQ_NONE;
|
2007-10-16 08:26:43 +00:00
|
|
|
} else if (err < 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
line->head = line->buffer;
|
|
|
|
line->tail = line->buffer;
|
|
|
|
}
|
2007-03-08 04:41:12 +00:00
|
|
|
spin_unlock(&line->lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (tty == NULL)
|
2005-05-01 15:58:56 +00:00
|
|
|
return IRQ_NONE;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
|
2005-04-16 22:20:36 +00:00
|
|
|
(tty->ldisc.write_wakeup != NULL))
|
|
|
|
(tty->ldisc.write_wakeup)(tty);
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* BLOCKING mode
|
2005-04-16 22:20:36 +00:00
|
|
|
* In blocking mode, everything sleeps on tty->write_wait.
|
|
|
|
* Sleeping in the console driver would break non-blocking
|
|
|
|
* writes.
|
|
|
|
*/
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
if (waitqueue_active(&tty->write_wait))
|
2005-04-16 22:20:36 +00:00
|
|
|
wake_up_interruptible(&tty->write_wait);
|
2005-05-01 15:58:56 +00:00
|
|
|
return IRQ_HANDLED;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2006-09-27 08:50:33 +00:00
|
|
|
const struct line_driver *driver = line->driver;
|
2006-07-02 02:29:27 +00:00
|
|
|
int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
if (input)
|
|
|
|
err = um_request_irq(driver->read_irq, fd, IRQ_READ,
|
2006-01-06 08:18:50 +00:00
|
|
|
line_interrupt, flags,
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
driver->read_irq_name, data);
|
2005-05-01 15:58:56 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
if (output)
|
|
|
|
err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
|
2006-01-06 08:18:50 +00:00
|
|
|
line_write_interrupt, flags,
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
driver->write_irq_name, data);
|
2005-04-16 22:20:36 +00:00
|
|
|
line->have_irq = 1;
|
2005-05-01 15:58:56 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* Normally, a driver like this can rely mostly on the tty layer
|
2007-02-10 09:43:52 +00:00
|
|
|
* locking, particularly when it comes to the driver structure.
|
|
|
|
* However, in this case, mconsole requests can come in "from the
|
|
|
|
* side", and race with opens and closes.
|
|
|
|
*
|
2007-02-10 09:44:08 +00:00
|
|
|
* mconsole config requests will want to be sure the device isn't in
|
|
|
|
* use, and get_config, open, and close will want a stable
|
|
|
|
* configuration. The checking and modification of the configuration
|
|
|
|
* is done under a spinlock. Checking whether the device is in use is
|
|
|
|
* line->tty->count > 1, also under the spinlock.
|
2007-02-10 09:43:52 +00:00
|
|
|
*
|
2007-02-10 09:44:08 +00:00
|
|
|
* tty->count serves to decide whether the device should be enabled or
|
|
|
|
* disabled on the host. If it's equal to 1, then we are doing the
|
|
|
|
* first open or last close. Otherwise, open and close just return.
|
2007-02-10 09:43:52 +00:00
|
|
|
*/
|
|
|
|
|
2006-01-06 08:18:55 +00:00
|
|
|
int line_open(struct line *lines, struct tty_struct *tty)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-02-10 09:43:52 +00:00
|
|
|
struct line *line = &lines[tty->index];
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
int err = -ENODEV;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
spin_lock(&line->count_lock);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->valid)
|
2007-02-10 09:43:52 +00:00
|
|
|
goto out_unlock;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
err = 0;
|
2007-10-16 08:26:43 +00:00
|
|
|
if (tty->count > 1)
|
2007-02-10 09:43:52 +00:00
|
|
|
goto out_unlock;
|
|
|
|
|
|
|
|
spin_unlock(&line->count_lock);
|
2006-01-06 08:18:55 +00:00
|
|
|
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
tty->driver_data = line;
|
|
|
|
line->tty = tty;
|
|
|
|
|
2007-07-16 06:38:54 +00:00
|
|
|
err = enable_chan(line);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
INIT_DELAYED_WORK(&line->task, line_timer_cb);
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->sigio) {
|
2007-02-10 09:43:52 +00:00
|
|
|
chan_enable_winch(&line->chan_list, tty);
|
|
|
|
line->sigio = 1;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
chan_window_size(&line->chan_list, &tty->winsize.ws_row,
|
|
|
|
&tty->winsize.ws_col);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
spin_unlock(&line->count_lock);
|
2005-05-01 15:58:56 +00:00
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-05-05 23:15:32 +00:00
|
|
|
static void unregister_winch(struct tty_struct *tty);
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
void line_close(struct tty_struct *tty, struct file * filp)
|
|
|
|
{
|
|
|
|
struct line *line = tty->driver_data;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* If line_open fails (and tty->driver_data is never set),
|
2007-02-10 09:43:52 +00:00
|
|
|
* tty_open will call line_close. So just return in this case.
|
|
|
|
*/
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line == NULL)
|
2007-02-10 09:43:52 +00:00
|
|
|
return;
|
2005-05-01 15:58:56 +00:00
|
|
|
|
|
|
|
/* We ignore the error anyway! */
|
|
|
|
flush_buffer(line);
|
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
spin_lock(&line->count_lock);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->valid)
|
2007-02-10 09:43:52 +00:00
|
|
|
goto out_unlock;
|
2005-05-05 23:15:32 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (tty->count > 1)
|
2007-02-10 09:43:52 +00:00
|
|
|
goto out_unlock;
|
|
|
|
|
|
|
|
spin_unlock(&line->count_lock);
|
|
|
|
|
|
|
|
line->tty = NULL;
|
|
|
|
tty->driver_data = NULL;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->sigio) {
|
2007-02-10 09:43:52 +00:00
|
|
|
unregister_winch(tty);
|
|
|
|
line->sigio = 0;
|
2007-10-16 08:26:43 +00:00
|
|
|
}
|
2005-05-05 23:15:32 +00:00
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
spin_unlock(&line->count_lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void close_lines(struct line *lines, int nlines)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < nlines; i++)
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
close_chan(&lines[i].chan_list, 0);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-02-10 09:43:53 +00:00
|
|
|
static int setup_one_line(struct line *lines, int n, char *init, int init_prio,
|
|
|
|
char **error_out)
|
2007-02-10 09:43:52 +00:00
|
|
|
{
|
|
|
|
struct line *line = &lines[n];
|
2007-02-10 09:43:53 +00:00
|
|
|
int err = -EINVAL;
|
2007-02-10 09:43:52 +00:00
|
|
|
|
|
|
|
spin_lock(&line->count_lock);
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->tty != NULL) {
|
2007-02-10 09:43:53 +00:00
|
|
|
*error_out = "Device is already open";
|
2007-02-10 09:43:52 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->init_pri <= init_prio) {
|
2007-02-10 09:43:52 +00:00
|
|
|
line->init_pri = init_prio;
|
|
|
|
if (!strcmp(init, "none"))
|
|
|
|
line->valid = 0;
|
|
|
|
else {
|
|
|
|
line->init_str = init;
|
|
|
|
line->valid = 1;
|
|
|
|
}
|
|
|
|
}
|
2007-02-10 09:43:53 +00:00
|
|
|
err = 0;
|
2007-02-10 09:43:52 +00:00
|
|
|
out:
|
|
|
|
spin_unlock(&line->count_lock);
|
2007-02-10 09:43:53 +00:00
|
|
|
return err;
|
2007-02-10 09:43:52 +00:00
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
/*
|
|
|
|
* Common setup code for both startup command line and mconsole initialization.
|
2006-10-03 20:21:02 +00:00
|
|
|
* @lines contains the array (of size @num) to modify;
|
2005-05-01 15:58:56 +00:00
|
|
|
* @init is the setup string;
|
2007-02-10 09:43:53 +00:00
|
|
|
* @error_out is an error string in the case of failure;
|
2006-01-06 08:18:53 +00:00
|
|
|
*/
|
2005-05-01 15:58:56 +00:00
|
|
|
|
2007-02-10 09:43:53 +00:00
|
|
|
int line_setup(struct line *lines, unsigned int num, char *init,
|
|
|
|
char **error_out)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-02-10 09:43:53 +00:00
|
|
|
int i, n, err;
|
2005-04-16 22:20:36 +00:00
|
|
|
char *end;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (*init == '=') {
|
|
|
|
/*
|
|
|
|
* We said con=/ssl= instead of con#=, so we are configuring all
|
|
|
|
* consoles at once.
|
|
|
|
*/
|
2005-05-01 15:58:56 +00:00
|
|
|
n = -1;
|
2006-01-06 08:18:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2005-04-16 22:20:36 +00:00
|
|
|
n = simple_strtoul(init, &end, 0);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (*end != '=') {
|
2007-02-10 09:43:53 +00:00
|
|
|
*error_out = "Couldn't parse device number";
|
|
|
|
return -EINVAL;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
init = end;
|
|
|
|
}
|
|
|
|
init++;
|
2005-05-01 15:58:56 +00:00
|
|
|
|
|
|
|
if (n >= (signed int) num) {
|
2007-02-10 09:43:53 +00:00
|
|
|
*error_out = "Device number out of range";
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2007-10-16 08:26:43 +00:00
|
|
|
else if (n >= 0) {
|
2007-02-10 09:43:53 +00:00
|
|
|
err = setup_one_line(lines, n, init, INIT_ONE, error_out);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (err)
|
2007-02-10 09:43:53 +00:00
|
|
|
return err;
|
2006-01-06 08:18:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2007-10-16 08:26:43 +00:00
|
|
|
for(i = 0; i < num; i++) {
|
2007-02-10 09:43:53 +00:00
|
|
|
err = setup_one_line(lines, i, init, INIT_ALL,
|
|
|
|
error_out);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (err)
|
2007-02-10 09:43:53 +00:00
|
|
|
return err;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2006-01-06 08:18:54 +00:00
|
|
|
return n == -1 ? num : n;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-01-06 08:18:55 +00:00
|
|
|
int line_config(struct line *lines, unsigned int num, char *str,
|
2007-02-10 09:43:53 +00:00
|
|
|
const struct chan_opts *opts, char **error_out)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2006-01-06 08:18:55 +00:00
|
|
|
struct line *line;
|
2006-01-06 08:18:48 +00:00
|
|
|
char *new;
|
2006-01-06 08:18:54 +00:00
|
|
|
int n;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (*str == '=') {
|
2007-02-10 09:43:53 +00:00
|
|
|
*error_out = "Can't configure all devices from mconsole";
|
|
|
|
return -EINVAL;
|
2006-01-06 08:18:53 +00:00
|
|
|
}
|
|
|
|
|
2006-01-06 08:18:48 +00:00
|
|
|
new = kstrdup(str, GFP_KERNEL);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (new == NULL) {
|
2007-02-10 09:43:53 +00:00
|
|
|
*error_out = "Failed to allocate memory";
|
|
|
|
return -ENOMEM;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2007-02-10 09:43:53 +00:00
|
|
|
n = line_setup(lines, num, new, error_out);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (n < 0)
|
2007-02-10 09:43:53 +00:00
|
|
|
return n;
|
2006-01-06 08:18:55 +00:00
|
|
|
|
|
|
|
line = &lines[n];
|
2007-02-10 09:43:53 +00:00
|
|
|
return parse_chan_pair(line->init_str, line, n, opts, error_out);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
|
2005-04-16 22:20:36 +00:00
|
|
|
int size, char **error_out)
|
|
|
|
{
|
|
|
|
struct line *line;
|
|
|
|
char *end;
|
|
|
|
int dev, n = 0;
|
|
|
|
|
|
|
|
dev = simple_strtoul(name, &end, 0);
|
2007-10-16 08:26:43 +00:00
|
|
|
if ((*end != '\0') || (end == name)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
*error_out = "line_get_config failed to parse device number";
|
2005-05-01 15:58:56 +00:00
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if ((dev < 0) || (dev >= num)) {
|
2005-05-01 15:58:56 +00:00
|
|
|
*error_out = "device number out of range";
|
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
line = &lines[dev];
|
|
|
|
|
2007-02-10 09:43:52 +00:00
|
|
|
spin_lock(&line->count_lock);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (!line->valid)
|
2005-04-16 22:20:36 +00:00
|
|
|
CONFIG_CHUNK(str, size, n, "none", 1);
|
2007-10-16 08:26:43 +00:00
|
|
|
else if (line->tty == NULL)
|
2005-04-16 22:20:36 +00:00
|
|
|
CONFIG_CHUNK(str, size, n, line->init_str, 1);
|
|
|
|
else n = chan_config_string(&line->chan_list, str, size, error_out);
|
2007-02-10 09:43:52 +00:00
|
|
|
spin_unlock(&line->count_lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-05-01 15:58:56 +00:00
|
|
|
return n;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-06-25 21:55:25 +00:00
|
|
|
int line_id(char **str, int *start_out, int *end_out)
|
|
|
|
{
|
|
|
|
char *end;
|
2007-10-16 08:26:43 +00:00
|
|
|
int n;
|
2005-06-25 21:55:25 +00:00
|
|
|
|
|
|
|
n = simple_strtoul(*str, &end, 0);
|
2007-10-16 08:26:43 +00:00
|
|
|
if ((*end != '\0') || (end == *str))
|
|
|
|
return -1;
|
2005-06-25 21:55:25 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
*str = end;
|
|
|
|
*start_out = n;
|
|
|
|
*end_out = n;
|
|
|
|
return n;
|
2005-06-25 21:55:25 +00:00
|
|
|
}
|
|
|
|
|
2007-02-10 09:43:53 +00:00
|
|
|
int line_remove(struct line *lines, unsigned int num, int n, char **error_out)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2006-01-06 08:18:54 +00:00
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
char config[sizeof("conxxxx=none\0")];
|
|
|
|
|
2005-06-25 21:55:25 +00:00
|
|
|
sprintf(config, "%d=none", n);
|
2007-02-10 09:43:53 +00:00
|
|
|
err = line_setup(lines, num, config, error_out);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (err >= 0)
|
2006-01-06 08:18:54 +00:00
|
|
|
err = 0;
|
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-02-10 09:44:08 +00:00
|
|
|
struct tty_driver *register_lines(struct line_driver *line_driver,
|
|
|
|
const struct tty_operations *ops,
|
|
|
|
struct line *lines, int nlines)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct tty_driver *driver = alloc_tty_driver(nlines);
|
|
|
|
|
|
|
|
if (!driver)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
driver->driver_name = line_driver->name;
|
|
|
|
driver->name = line_driver->device_name;
|
|
|
|
driver->major = line_driver->major;
|
|
|
|
driver->minor_start = line_driver->minor_start;
|
|
|
|
driver->type = line_driver->type;
|
|
|
|
driver->subtype = line_driver->subtype;
|
|
|
|
driver->flags = TTY_DRIVER_REAL_RAW;
|
|
|
|
driver->init_termios = tty_std_termios;
|
|
|
|
tty_set_operations(driver, ops);
|
|
|
|
|
|
|
|
if (tty_register_driver(driver)) {
|
2007-10-16 08:26:43 +00:00
|
|
|
printk(KERN_ERR "register_lines : can't register %s driver\n",
|
|
|
|
line_driver->name);
|
2005-04-16 22:20:36 +00:00
|
|
|
put_tty_driver(driver);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
for(i = 0; i < nlines; i++) {
|
|
|
|
if (!lines[i].valid)
|
2005-04-16 22:20:36 +00:00
|
|
|
tty_unregister_device(driver, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
mconsole_register_dev(&line_driver->mc);
|
|
|
|
return driver;
|
|
|
|
}
|
|
|
|
|
2006-01-06 08:18:54 +00:00
|
|
|
static DEFINE_SPINLOCK(winch_handler_lock);
|
|
|
|
static LIST_HEAD(winch_handlers);
|
2005-07-08 00:56:52 +00:00
|
|
|
|
2006-01-06 08:18:55 +00:00
|
|
|
void lines_init(struct line *lines, int nlines, struct chan_opts *opts)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct line *line;
|
2007-02-10 09:43:53 +00:00
|
|
|
char *error;
|
2005-04-16 22:20:36 +00:00
|
|
|
int i;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
for(i = 0; i < nlines; i++) {
|
2005-04-16 22:20:36 +00:00
|
|
|
line = &lines[i];
|
|
|
|
INIT_LIST_HEAD(&line->chan_list);
|
2006-01-06 08:18:54 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->init_str == NULL)
|
2006-01-06 08:18:50 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
line->init_str = kstrdup(line->init_str, GFP_KERNEL);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (line->init_str == NULL)
|
|
|
|
printk(KERN_ERR "lines_init - kstrdup returned NULL\n");
|
2006-01-06 08:18:55 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (parse_chan_pair(line->init_str, line, i, opts, &error)) {
|
|
|
|
printk(KERN_ERR "parse_chan_pair failed for "
|
|
|
|
"device %d : %s\n", i, error);
|
2006-01-06 08:18:55 +00:00
|
|
|
line->valid = 0;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct winch {
|
|
|
|
struct list_head list;
|
|
|
|
int fd;
|
|
|
|
int tty_fd;
|
|
|
|
int pid;
|
|
|
|
struct tty_struct *tty;
|
2007-07-16 06:38:55 +00:00
|
|
|
unsigned long stack;
|
2005-04-16 22:20:36 +00:00
|
|
|
};
|
|
|
|
|
2007-07-16 06:38:55 +00:00
|
|
|
static void free_winch(struct winch *winch, int free_irq_ok)
|
|
|
|
{
|
|
|
|
list_del(&winch->list);
|
|
|
|
|
|
|
|
if (winch->pid != -1)
|
|
|
|
os_kill_process(winch->pid, 1);
|
|
|
|
if (winch->fd != -1)
|
|
|
|
os_close_file(winch->fd);
|
|
|
|
if (winch->stack != 0)
|
|
|
|
free_stack(winch->stack, 0);
|
|
|
|
if (free_irq_ok)
|
|
|
|
free_irq(WINCH_IRQ, winch);
|
|
|
|
kfree(winch);
|
|
|
|
}
|
|
|
|
|
2006-10-08 21:49:34 +00:00
|
|
|
static irqreturn_t winch_interrupt(int irq, void *data)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct winch *winch = data;
|
|
|
|
struct tty_struct *tty;
|
|
|
|
struct line *line;
|
|
|
|
int err;
|
|
|
|
char c;
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
if (winch->fd != -1) {
|
2005-04-16 22:20:36 +00:00
|
|
|
err = generic_read(winch->fd, &c, NULL);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (err < 0) {
|
|
|
|
if (err != -EAGAIN) {
|
|
|
|
printk(KERN_ERR "winch_interrupt : "
|
|
|
|
"read failed, errno = %d\n", -err);
|
|
|
|
printk(KERN_ERR "fd %d is losing SIGWINCH "
|
|
|
|
"support\n", winch->tty_fd);
|
2007-07-16 06:38:55 +00:00
|
|
|
free_winch(winch, 0);
|
2005-05-01 15:58:56 +00:00
|
|
|
return IRQ_HANDLED;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2007-07-16 06:38:55 +00:00
|
|
|
tty = winch->tty;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (tty != NULL) {
|
|
|
|
line = tty->driver_data;
|
2008-02-05 06:31:19 +00:00
|
|
|
if (line != NULL) {
|
|
|
|
chan_window_size(&line->chan_list, &tty->winsize.ws_row,
|
|
|
|
&tty->winsize.ws_col);
|
|
|
|
kill_pgrp(tty->pgrp, SIGWINCH, 1);
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
out:
|
2007-10-16 08:26:43 +00:00
|
|
|
if (winch->fd != -1)
|
2005-04-16 22:20:36 +00:00
|
|
|
reactivate_fd(winch->fd, WINCH_IRQ);
|
2005-05-01 15:58:56 +00:00
|
|
|
return IRQ_HANDLED;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-07-16 06:38:55 +00:00
|
|
|
void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
|
|
|
|
unsigned long stack)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct winch *winch;
|
|
|
|
|
|
|
|
winch = kmalloc(sizeof(*winch), GFP_KERNEL);
|
|
|
|
if (winch == NULL) {
|
2007-10-16 08:26:43 +00:00
|
|
|
printk(KERN_ERR "register_winch_irq - kmalloc failed\n");
|
2007-07-16 06:38:55 +00:00
|
|
|
goto cleanup;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2005-07-08 00:56:52 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
*winch = ((struct winch) { .list = LIST_HEAD_INIT(winch->list),
|
|
|
|
.fd = fd,
|
|
|
|
.tty_fd = tty_fd,
|
|
|
|
.pid = pid,
|
2007-07-16 06:38:55 +00:00
|
|
|
.tty = tty,
|
|
|
|
.stack = stack });
|
|
|
|
|
|
|
|
if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
|
|
|
|
IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
|
|
|
|
"winch", winch) < 0) {
|
2007-10-16 08:26:43 +00:00
|
|
|
printk(KERN_ERR "register_winch_irq - failed to register "
|
|
|
|
"IRQ\n");
|
2007-07-16 06:38:55 +00:00
|
|
|
goto out_free;
|
|
|
|
}
|
2005-07-08 00:56:52 +00:00
|
|
|
|
|
|
|
spin_lock(&winch_handler_lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
list_add(&winch->list, &winch_handlers);
|
2005-07-08 00:56:52 +00:00
|
|
|
spin_unlock(&winch_handler_lock);
|
|
|
|
|
2007-07-16 06:38:55 +00:00
|
|
|
return;
|
2006-01-06 08:19:01 +00:00
|
|
|
|
2007-07-16 06:38:55 +00:00
|
|
|
out_free:
|
2006-01-06 08:19:01 +00:00
|
|
|
kfree(winch);
|
2007-07-16 06:38:55 +00:00
|
|
|
cleanup:
|
|
|
|
os_kill_process(pid, 1);
|
|
|
|
os_close_file(fd);
|
|
|
|
if (stack != 0)
|
|
|
|
free_stack(stack, 0);
|
2006-01-06 08:19:01 +00:00
|
|
|
}
|
|
|
|
|
2005-05-05 23:15:32 +00:00
|
|
|
static void unregister_winch(struct tty_struct *tty)
|
|
|
|
{
|
|
|
|
struct list_head *ele;
|
2006-01-06 08:19:01 +00:00
|
|
|
struct winch *winch;
|
2005-05-05 23:15:32 +00:00
|
|
|
|
2005-07-08 00:56:52 +00:00
|
|
|
spin_lock(&winch_handler_lock);
|
2006-01-06 08:19:01 +00:00
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
list_for_each(ele, &winch_handlers) {
|
2005-05-05 23:15:32 +00:00
|
|
|
winch = list_entry(ele, struct winch, list);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (winch->tty == tty) {
|
2007-07-16 06:38:55 +00:00
|
|
|
free_winch(winch, 1);
|
2006-01-06 08:19:01 +00:00
|
|
|
break;
|
2007-10-16 08:26:43 +00:00
|
|
|
}
|
|
|
|
}
|
2005-07-08 00:56:52 +00:00
|
|
|
spin_unlock(&winch_handler_lock);
|
2005-05-05 23:15:32 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static void winch_cleanup(void)
|
|
|
|
{
|
2006-01-06 08:19:01 +00:00
|
|
|
struct list_head *ele, *next;
|
2005-04-16 22:20:36 +00:00
|
|
|
struct winch *winch;
|
|
|
|
|
2006-01-06 08:19:01 +00:00
|
|
|
spin_lock(&winch_handler_lock);
|
|
|
|
|
2007-10-16 08:26:43 +00:00
|
|
|
list_for_each_safe(ele, next, &winch_handlers) {
|
2005-04-16 22:20:36 +00:00
|
|
|
winch = list_entry(ele, struct winch, list);
|
2007-07-16 06:38:55 +00:00
|
|
|
free_winch(winch, 1);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2006-01-06 08:19:01 +00:00
|
|
|
|
|
|
|
spin_unlock(&winch_handler_lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
__uml_exitcall(winch_cleanup);
|
|
|
|
|
|
|
|
char *add_xterm_umid(char *base)
|
|
|
|
{
|
|
|
|
char *umid, *title;
|
|
|
|
int len;
|
|
|
|
|
2006-01-06 08:19:01 +00:00
|
|
|
umid = get_umid();
|
2007-10-16 08:26:43 +00:00
|
|
|
if (*umid == '\0')
|
2005-05-01 15:58:56 +00:00
|
|
|
return base;
|
[PATCH] uml: Simplify console opening/closing and irq registration
This patch simplifies the opening and closing of host console devices and the
registration and deregistration of IRQs. The intent is to make it obvious
that an IRQ can't exist without an open file descriptor.
chan_enable will now open the channel, and when both opening and IRQ
registration are desired, this should be used. Opening only is done for the
initial console, so that interface still needs to exist.
The free_irqs_later interface is now gone. It was intended to avoid freeing
an IRQ while it was being processed. It did this, but it didn't eliminate the
possiblity of free_irq being called from an interrupt, which is bad. In its
place is a list of irqs to be freed, which is processed by the signal handler
just before exiting. close_one_chan now disables irqs.
When a host device disappears, it is just closed, and that disables IRQs.
The device id registered with the IRQ is now the chan structure, not the tty.
This is because the interrupt arrives on a descriptor associated with the
channel. This caused equivalent changes in the arguments to line_timer_cb.
line_disable is gone since it is not used any more.
The count field in the line structure is gone. tty->count is used instead.
The complicated logic in sigio_handler with freeing IRQs when necessary and
making sure its idea of the next irq is correct is now much simpler. The irq
list can't be rearranged underneath it, so it is now a simple list walk.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:18:57 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
len = strlen(base) + strlen(" ()") + strlen(umid) + 1;
|
|
|
|
title = kmalloc(len, GFP_KERNEL);
|
2007-10-16 08:26:43 +00:00
|
|
|
if (title == NULL) {
|
|
|
|
printk(KERN_ERR "Failed to allocate buffer for xterm title\n");
|
2005-05-01 15:58:56 +00:00
|
|
|
return base;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
snprintf(title, len, "%s (%s)", base, umid);
|
2005-05-01 15:58:56 +00:00
|
|
|
return title;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|