[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 15:18:57 +07:00
|
|
|
/*
|
2007-10-16 15:26:41 +07:00
|
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
|
2005-04-17 05:20:36 +07:00
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/tty.h>
|
|
|
|
#include <linux/tty_flip.h>
|
2011-08-19 02:08:29 +07:00
|
|
|
#include "chan.h"
|
2012-10-08 09:27:32 +07:00
|
|
|
#include <os.h>
|
|
|
|
#include <irq_kern.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2005-09-23 11:44:22 +07:00
|
|
|
#ifdef CONFIG_NOCONFIG_CHAN
|
2007-02-10 16:43:53 +07:00
|
|
|
static void *not_configged_init(char *str, int device,
|
|
|
|
const struct chan_opts *opts)
|
2005-09-23 11:44:22 +07:00
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int not_configged_open(int input, int output, int primary, void *data,
|
|
|
|
char **dev_out)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return -ENODEV;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void not_configged_close(int fd, void *data)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static int not_configged_read(int fd, char *c_out, void *data)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return -EIO;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int not_configged_write(int fd, const char *buf, int len, void *data)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return -EIO;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2005-11-14 07:07:11 +07:00
|
|
|
static int not_configged_console_write(int fd, const char *buf, int len)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return -EIO;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int not_configged_window_size(int fd, void *data, unsigned short *rows,
|
|
|
|
unsigned short *cols)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
2006-01-06 15:18:50 +07:00
|
|
|
return -ENODEV;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void not_configged_free(void *data)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_ERR "Using a channel type which is configured out of "
|
2005-04-17 05:20:36 +07:00
|
|
|
"UML\n");
|
|
|
|
}
|
|
|
|
|
2006-09-27 15:50:33 +07:00
|
|
|
static const struct chan_ops not_configged_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.init = not_configged_init,
|
|
|
|
.open = not_configged_open,
|
|
|
|
.close = not_configged_close,
|
|
|
|
.read = not_configged_read,
|
|
|
|
.write = not_configged_write,
|
|
|
|
.console_write = not_configged_console_write,
|
|
|
|
.window_size = not_configged_window_size,
|
|
|
|
.free = not_configged_free,
|
|
|
|
.winch = 0,
|
|
|
|
};
|
|
|
|
#endif /* CONFIG_NOCONFIG_CHAN */
|
|
|
|
|
2006-01-06 15:18:50 +07:00
|
|
|
static int open_one_chan(struct chan *chan)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-07-31 14:37:44 +07:00
|
|
|
int fd, err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->opened)
|
2006-01-06 15:18:50 +07:00
|
|
|
return 0;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->ops->open == NULL)
|
2006-01-06 15:18:50 +07:00
|
|
|
fd = 0;
|
|
|
|
else fd = (*chan->ops->open)(chan->input, chan->output, chan->primary,
|
|
|
|
chan->data, &chan->dev);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (fd < 0)
|
2006-01-06 15:18:50 +07:00
|
|
|
return fd;
|
2007-07-31 14:37:44 +07:00
|
|
|
|
|
|
|
err = os_set_fd_block(fd, 0);
|
|
|
|
if (err) {
|
|
|
|
(*chan->ops->close)(fd, chan->data);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
chan->fd = fd;
|
|
|
|
|
|
|
|
chan->opened = 1;
|
2006-01-06 15:18:50 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-04-28 16:13:55 +07:00
|
|
|
static int open_chan(struct list_head *chans)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct list_head *ele;
|
|
|
|
struct chan *chan;
|
|
|
|
int ret, err = 0;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
list_for_each(ele, chans) {
|
2005-04-17 05:20:36 +07:00
|
|
|
chan = list_entry(ele, struct chan, list);
|
2006-01-06 15:18:50 +07:00
|
|
|
ret = open_one_chan(chan);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->primary)
|
2006-01-06 15:18:50 +07:00
|
|
|
err = ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-01-06 15:18:50 +07:00
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-03-11 16:05:45 +07:00
|
|
|
void chan_enable_winch(struct chan *chan, struct tty_port *port)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-09-08 21:49:34 +07:00
|
|
|
if (chan && chan->primary && chan->ops->winch)
|
2013-03-11 16:05:45 +07:00
|
|
|
register_winch(chan->fd, port);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-09-10 19:17:04 +07:00
|
|
|
static void line_timer_cb(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct line *line = container_of(work, struct line, task.work);
|
|
|
|
|
|
|
|
if (!line->throttled)
|
2013-01-03 21:53:06 +07:00
|
|
|
chan_interrupt(line, line->driver->read_irq);
|
2011-09-10 19:17:04 +07:00
|
|
|
}
|
|
|
|
|
2007-07-16 13:38:54 +07:00
|
|
|
int enable_chan(struct line *line)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct list_head *ele;
|
|
|
|
struct chan *chan;
|
2007-07-16 13:38:54 +07:00
|
|
|
int err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-09-10 19:17:04 +07:00
|
|
|
INIT_DELAYED_WORK(&line->task, line_timer_cb);
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
list_for_each(ele, &line->chan_list) {
|
2005-04-17 05:20:36 +07:00
|
|
|
chan = list_entry(ele, struct chan, list);
|
2007-07-16 13:38:54 +07:00
|
|
|
err = open_one_chan(chan);
|
|
|
|
if (err) {
|
|
|
|
if (chan->primary)
|
|
|
|
goto out_close;
|
|
|
|
|
[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 15:18:57 +07:00
|
|
|
continue;
|
2007-07-16 13:38:54 +07: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 15:18:57 +07:00
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->enabled)
|
[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 15:18:57 +07:00
|
|
|
continue;
|
2007-07-16 13:38:54 +07:00
|
|
|
err = line_setup_irq(chan->fd, chan->input, chan->output, line,
|
|
|
|
chan);
|
|
|
|
if (err)
|
|
|
|
goto out_close;
|
|
|
|
|
[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 15:18:57 +07:00
|
|
|
chan->enabled = 1;
|
|
|
|
}
|
2007-07-16 13:38:54 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_close:
|
2011-09-10 19:39:18 +07:00
|
|
|
close_chan(line);
|
2007-07-16 13:38:54 +07:00
|
|
|
return err;
|
[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 15:18:57 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void close_one_chan(struct chan *chan, int delay_free_irq)
|
|
|
|
{
|
2007-10-16 15:26:41 +07:00
|
|
|
if (!chan->opened)
|
[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 15:18:57 +07:00
|
|
|
return;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2017-11-21 04:17:58 +07:00
|
|
|
/* we can safely call free now - it will be marked
|
|
|
|
* as free and freed once the IRQ stopped processing
|
|
|
|
*/
|
|
|
|
if (chan->input && chan->enabled)
|
|
|
|
um_free_irq(chan->line->driver->read_irq, chan);
|
|
|
|
if (chan->output && chan->enabled)
|
|
|
|
um_free_irq(chan->line->driver->write_irq, chan);
|
|
|
|
chan->enabled = 0;
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->ops->close != NULL)
|
[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 15:18:57 +07:00
|
|
|
(*chan->ops->close)(chan->fd, chan->data);
|
|
|
|
|
|
|
|
chan->opened = 0;
|
|
|
|
chan->fd = -1;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-09-10 19:39:18 +07:00
|
|
|
void close_chan(struct line *line)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct chan *chan;
|
|
|
|
|
|
|
|
/* Close in reverse order as open in case more than one of them
|
|
|
|
* refers to the same device and they save and restore that device's
|
|
|
|
* state. Then, the first one opened will have the original state,
|
|
|
|
* so it must be the last closed.
|
|
|
|
*/
|
2011-09-10 19:39:18 +07:00
|
|
|
list_for_each_entry_reverse(chan, &line->chan_list, list) {
|
|
|
|
close_one_chan(chan, 0);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
void deactivate_chan(struct chan *chan, int irq)
|
2006-01-06 15:18:58 +07:00
|
|
|
{
|
2011-09-08 21:49:34 +07:00
|
|
|
if (chan && chan->enabled)
|
|
|
|
deactivate_fd(chan->fd, irq);
|
2006-01-06 15:18:58 +07:00
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
void reactivate_chan(struct chan *chan, int irq)
|
2006-01-06 15:18:58 +07:00
|
|
|
{
|
2011-09-08 21:49:34 +07:00
|
|
|
if (chan && chan->enabled)
|
|
|
|
reactivate_fd(chan->fd, irq);
|
2006-01-06 15:18:58 +07:00
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
int write_chan(struct chan *chan, const char *buf, int len,
|
2005-04-17 05:20:36 +07:00
|
|
|
int write_irq)
|
|
|
|
{
|
|
|
|
int n, ret = 0;
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
if (len == 0 || !chan || !chan->ops->write)
|
2007-10-16 15:26:42 +07:00
|
|
|
return 0;
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
n = chan->ops->write(chan->fd, buf, len, chan->data);
|
|
|
|
if (chan->primary) {
|
|
|
|
ret = n;
|
|
|
|
if ((ret == -EAGAIN) || ((ret >= 0) && (ret < len)))
|
|
|
|
reactivate_fd(chan->fd, write_irq);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-01-06 15:18:50 +07:00
|
|
|
return ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
int console_write_chan(struct chan *chan, const char *buf, int len)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int n, ret = 0;
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
if (!chan || !chan->ops->console_write)
|
|
|
|
return 0;
|
2007-10-16 15:26:41 +07:00
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
n = chan->ops->console_write(chan->fd, buf, len);
|
|
|
|
if (chan->primary)
|
|
|
|
ret = n;
|
2006-01-06 15:18:50 +07:00
|
|
|
return ret;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2007-02-10 16:44:06 +07:00
|
|
|
int console_open_chan(struct line *line, struct console *co)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2006-01-06 15:18:55 +07:00
|
|
|
int err;
|
|
|
|
|
|
|
|
err = open_chan(&line->chan_list);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (err)
|
2006-01-06 15:18:55 +07:00
|
|
|
return err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
printk(KERN_INFO "Console initialized on /dev/%s%d\n", co->name,
|
|
|
|
co->index);
|
2005-04-17 05:20:36 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
int chan_window_size(struct line *line, unsigned short *rows_out,
|
2005-04-17 05:20:36 +07:00
|
|
|
unsigned short *cols_out)
|
|
|
|
{
|
|
|
|
struct chan *chan;
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
chan = line->chan_in;
|
|
|
|
if (chan && chan->primary) {
|
|
|
|
if (chan->ops->window_size == NULL)
|
|
|
|
return 0;
|
|
|
|
return chan->ops->window_size(chan->fd, chan->data,
|
|
|
|
rows_out, cols_out);
|
|
|
|
}
|
|
|
|
chan = line->chan_out;
|
|
|
|
if (chan && chan->primary) {
|
|
|
|
if (chan->ops->window_size == NULL)
|
|
|
|
return 0;
|
|
|
|
return chan->ops->window_size(chan->fd, chan->data,
|
|
|
|
rows_out, cols_out);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-01-06 15:18:50 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-08-19 02:12:39 +07:00
|
|
|
static void free_one_chan(struct chan *chan)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
list_del(&chan->list);
|
[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 15:18:57 +07:00
|
|
|
|
2011-08-19 02:12:39 +07:00
|
|
|
close_one_chan(chan, 0);
|
[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 15:18:57 +07:00
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->ops->free != NULL)
|
2005-04-17 05:20:36 +07:00
|
|
|
(*chan->ops->free)(chan->data);
|
[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 15:18:57 +07:00
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->primary && chan->output)
|
|
|
|
ignore_sigio_fd(chan->fd);
|
2005-04-17 05:20:36 +07:00
|
|
|
kfree(chan);
|
|
|
|
}
|
|
|
|
|
2011-08-19 02:12:39 +07:00
|
|
|
static void free_chan(struct list_head *chans)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
struct list_head *ele, *next;
|
|
|
|
struct chan *chan;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
list_for_each_safe(ele, next, chans) {
|
2005-04-17 05:20:36 +07:00
|
|
|
chan = list_entry(ele, struct chan, list);
|
2011-08-19 02:12:39 +07:00
|
|
|
free_one_chan(chan);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int one_chan_config_string(struct chan *chan, char *str, int size,
|
|
|
|
char **error_out)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan == NULL) {
|
2005-04-17 05:20:36 +07:00
|
|
|
CONFIG_CHUNK(str, size, n, "none", 1);
|
2006-01-06 15:18:50 +07:00
|
|
|
return n;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan->dev == NULL) {
|
2005-04-17 05:20:36 +07:00
|
|
|
CONFIG_CHUNK(str, size, n, "", 1);
|
2006-01-06 15:18:50 +07:00
|
|
|
return n;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
CONFIG_CHUNK(str, size, n, ":", 0);
|
|
|
|
CONFIG_CHUNK(str, size, n, chan->dev, 0);
|
|
|
|
|
2006-01-06 15:18:50 +07:00
|
|
|
return n;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2006-01-06 15:18:50 +07:00
|
|
|
static int chan_pair_config_string(struct chan *in, struct chan *out,
|
2005-04-17 05:20:36 +07:00
|
|
|
char *str, int size, char **error_out)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
n = one_chan_config_string(in, str, size, error_out);
|
|
|
|
str += n;
|
|
|
|
size -= n;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (in == out) {
|
2005-04-17 05:20:36 +07:00
|
|
|
CONFIG_CHUNK(str, size, n, "", 1);
|
2006-01-06 15:18:50 +07:00
|
|
|
return n;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
CONFIG_CHUNK(str, size, n, ",", 1);
|
|
|
|
n = one_chan_config_string(out, str, size, error_out);
|
|
|
|
str += n;
|
|
|
|
size -= n;
|
|
|
|
CONFIG_CHUNK(str, size, n, "", 1);
|
|
|
|
|
2006-01-06 15:18:50 +07:00
|
|
|
return n;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
int chan_config_string(struct line *line, char *str, int size,
|
2005-04-17 05:20:36 +07:00
|
|
|
char **error_out)
|
|
|
|
{
|
2011-09-08 21:49:34 +07:00
|
|
|
struct chan *in = line->chan_in, *out = line->chan_out;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
if (in && !in->primary)
|
|
|
|
in = NULL;
|
|
|
|
if (out && !out->primary)
|
|
|
|
out = NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-01-06 15:18:50 +07:00
|
|
|
return chan_pair_config_string(in, out, str, size, error_out);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
struct chan_type {
|
|
|
|
char *key;
|
2006-09-27 15:50:33 +07:00
|
|
|
const struct chan_ops *ops;
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2006-09-27 15:50:33 +07:00
|
|
|
static const struct chan_type chan_table[] = {
|
2005-04-17 05:20:36 +07:00
|
|
|
{ "fd", &fd_ops },
|
|
|
|
|
|
|
|
#ifdef CONFIG_NULL_CHAN
|
|
|
|
{ "null", &null_ops },
|
|
|
|
#else
|
|
|
|
{ "null", ¬_configged_ops },
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_PORT_CHAN
|
|
|
|
{ "port", &port_ops },
|
|
|
|
#else
|
|
|
|
{ "port", ¬_configged_ops },
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_PTY_CHAN
|
|
|
|
{ "pty", &pty_ops },
|
|
|
|
{ "pts", &pts_ops },
|
|
|
|
#else
|
|
|
|
{ "pty", ¬_configged_ops },
|
|
|
|
{ "pts", ¬_configged_ops },
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_TTY_CHAN
|
|
|
|
{ "tty", &tty_ops },
|
|
|
|
#else
|
|
|
|
{ "tty", ¬_configged_ops },
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_XTERM_CHAN
|
|
|
|
{ "xterm", &xterm_ops },
|
|
|
|
#else
|
|
|
|
{ "xterm", ¬_configged_ops },
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
[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 15:18:57 +07:00
|
|
|
static struct chan *parse_chan(struct line *line, char *str, int device,
|
2007-02-10 16:43:53 +07:00
|
|
|
const struct chan_opts *opts, char **error_out)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2006-09-27 15:50:33 +07:00
|
|
|
const struct chan_type *entry;
|
|
|
|
const struct chan_ops *ops;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct chan *chan;
|
|
|
|
void *data;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ops = NULL;
|
|
|
|
data = NULL;
|
2007-10-16 15:26:41 +07:00
|
|
|
for(i = 0; i < ARRAY_SIZE(chan_table); i++) {
|
2005-04-17 05:20:36 +07:00
|
|
|
entry = &chan_table[i];
|
2007-10-16 15:26:41 +07:00
|
|
|
if (!strncmp(str, entry->key, strlen(entry->key))) {
|
2005-04-17 05:20:36 +07:00
|
|
|
ops = entry->ops;
|
|
|
|
str += strlen(entry->key);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-10-16 15:26:41 +07:00
|
|
|
if (ops == NULL) {
|
2007-02-10 16:43:53 +07:00
|
|
|
*error_out = "No match for configured backends";
|
2006-01-06 15:18:50 +07:00
|
|
|
return NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2007-02-10 16:43:53 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
data = (*ops->init)(str, device, opts);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (data == NULL) {
|
2007-02-10 16:43:53 +07:00
|
|
|
*error_out = "Configuration failed";
|
2006-01-06 15:18:50 +07:00
|
|
|
return NULL;
|
2007-02-10 16:43:53 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2005-09-23 11:44:21 +07:00
|
|
|
chan = kmalloc(sizeof(*chan), GFP_ATOMIC);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (chan == NULL) {
|
2007-02-10 16:43:53 +07:00
|
|
|
*error_out = "Memory allocation failed";
|
2006-01-06 15:18:50 +07:00
|
|
|
return NULL;
|
2007-02-10 16:43:53 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
*chan = ((struct chan) { .list = LIST_HEAD_INIT(chan->list),
|
[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 15:18:57 +07:00
|
|
|
.free_list =
|
|
|
|
LIST_HEAD_INIT(chan->free_list),
|
|
|
|
.line = line,
|
2005-04-17 05:20:36 +07:00
|
|
|
.primary = 1,
|
|
|
|
.input = 0,
|
|
|
|
.output = 0,
|
|
|
|
.opened = 0,
|
[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 15:18:57 +07:00
|
|
|
.enabled = 0,
|
2005-04-17 05:20:36 +07:00
|
|
|
.fd = -1,
|
|
|
|
.ops = ops,
|
|
|
|
.data = data });
|
2006-01-06 15:18:50 +07:00
|
|
|
return chan;
|
2005-04-17 05:20:36 +07: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 15:18:57 +07:00
|
|
|
int parse_chan_pair(char *str, struct line *line, int device,
|
2007-02-10 16:43:53 +07:00
|
|
|
const struct chan_opts *opts, char **error_out)
|
2005-04-17 05:20:36 +07: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 15:18:57 +07:00
|
|
|
struct list_head *chans = &line->chan_list;
|
2011-07-26 07:12:55 +07:00
|
|
|
struct chan *new;
|
2005-04-17 05:20:36 +07:00
|
|
|
char *in, *out;
|
|
|
|
|
2007-10-16 15:26:41 +07:00
|
|
|
if (!list_empty(chans)) {
|
2011-09-08 18:07:26 +07:00
|
|
|
line->chan_in = line->chan_out = NULL;
|
2011-08-19 02:12:39 +07:00
|
|
|
free_chan(chans);
|
2005-04-17 05:20:36 +07:00
|
|
|
INIT_LIST_HEAD(chans);
|
|
|
|
}
|
|
|
|
|
2011-09-10 06:14:02 +07:00
|
|
|
if (!str)
|
|
|
|
return 0;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
out = strchr(str, ',');
|
2007-10-16 15:26:41 +07:00
|
|
|
if (out != NULL) {
|
2005-04-17 05:20:36 +07:00
|
|
|
in = str;
|
|
|
|
*out = '\0';
|
|
|
|
out++;
|
2007-02-10 16:43:53 +07:00
|
|
|
new = parse_chan(line, in, device, opts, error_out);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (new == NULL)
|
2006-01-06 15:18:50 +07:00
|
|
|
return -1;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
new->input = 1;
|
|
|
|
list_add(&new->list, chans);
|
2011-09-08 18:07:26 +07:00
|
|
|
line->chan_in = new;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2007-02-10 16:43:53 +07:00
|
|
|
new = parse_chan(line, out, device, opts, error_out);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (new == NULL)
|
2006-01-06 15:18:50 +07:00
|
|
|
return -1;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
list_add(&new->list, chans);
|
|
|
|
new->output = 1;
|
2011-09-08 18:07:26 +07:00
|
|
|
line->chan_out = new;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
else {
|
2007-02-10 16:43:53 +07:00
|
|
|
new = parse_chan(line, str, device, opts, error_out);
|
2007-10-16 15:26:41 +07:00
|
|
|
if (new == NULL)
|
2006-01-06 15:18:50 +07:00
|
|
|
return -1;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
list_add(&new->list, chans);
|
|
|
|
new->input = 1;
|
|
|
|
new->output = 1;
|
2011-09-08 18:07:26 +07:00
|
|
|
line->chan_in = line->chan_out = new;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-01-06 15:18:50 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-01-03 21:53:06 +07:00
|
|
|
void chan_interrupt(struct line *line, int irq)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2013-01-03 21:53:01 +07:00
|
|
|
struct tty_port *port = &line->port;
|
2011-09-08 21:49:34 +07:00
|
|
|
struct chan *chan = line->chan_in;
|
2005-04-17 05:20:36 +07:00
|
|
|
int err;
|
|
|
|
char c;
|
|
|
|
|
2011-09-08 21:49:34 +07:00
|
|
|
if (!chan || !chan->ops->read)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
do {
|
2013-01-03 21:53:01 +07:00
|
|
|
if (!tty_buffer_request_room(port, 1)) {
|
2011-09-10 19:17:04 +07:00
|
|
|
schedule_delayed_work(&line->task, 1);
|
2011-09-08 21:49:34 +07:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
err = chan->ops->read(chan->fd, &c, chan->data);
|
|
|
|
if (err > 0)
|
2013-01-03 21:53:03 +07:00
|
|
|
tty_insert_flip_char(port, c, TTY_NORMAL);
|
2011-09-08 21:49:34 +07:00
|
|
|
} while (err > 0);
|
|
|
|
|
|
|
|
if (err == 0)
|
|
|
|
reactivate_fd(chan->fd, irq);
|
|
|
|
if (err == -EIO) {
|
|
|
|
if (chan->primary) {
|
2013-03-07 19:12:30 +07:00
|
|
|
tty_port_tty_hangup(&line->port, false);
|
2011-09-10 19:39:18 +07:00
|
|
|
if (line->chan_out != chan)
|
|
|
|
close_one_chan(line->chan_out, 1);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2011-09-10 19:39:18 +07:00
|
|
|
close_one_chan(chan, 1);
|
|
|
|
if (chan->primary)
|
|
|
|
return;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
out:
|
2013-01-03 21:53:06 +07:00
|
|
|
tty_flip_buffer_push(port);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|