Commit 79e0273d authored by Richard Weinberger's avatar Richard Weinberger

um: fully use tty_port

... use all tty_port helpers
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent df7b86f3
...@@ -296,43 +296,14 @@ int line_setup_irq(int fd, int input, int output, struct line *line, void *data) ...@@ -296,43 +296,14 @@ int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
return err; return err;
} }
/* static int line_activate(struct tty_port *port, struct tty_struct *tty)
* Normally, a driver like this can rely mostly on the tty layer
* 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.
*
* 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.
*
* line->count serves to decide whether the device should be enabled or
* disabled on the host. If it's equal to 0, then we are doing the
* first open or last close. Otherwise, open and close just return.
*/
int line_open(struct line *lines, struct tty_struct *tty)
{ {
struct line *line = &lines[tty->index]; int ret;
int err = -ENODEV; struct line *line = tty->driver_data;
mutex_lock(&line->count_lock);
if (!line->valid)
goto out_unlock;
err = 0;
if (line->port.count++)
goto out_unlock;
BUG_ON(tty->driver_data);
tty->driver_data = line;
tty_port_tty_set(&line->port, tty);
err = enable_chan(line); ret = enable_chan(line);
if (err) /* line_close() will be called by our caller */ if (ret)
goto out_unlock; return ret;
if (!line->sigio) { if (!line->sigio) {
chan_enable_winch(line->chan_out, tty); chan_enable_winch(line->chan_out, tty);
...@@ -341,43 +312,59 @@ int line_open(struct line *lines, struct tty_struct *tty) ...@@ -341,43 +312,59 @@ int line_open(struct line *lines, struct tty_struct *tty)
chan_window_size(line, &tty->winsize.ws_row, chan_window_size(line, &tty->winsize.ws_row,
&tty->winsize.ws_col); &tty->winsize.ws_col);
out_unlock:
mutex_unlock(&line->count_lock); return 0;
return err;
} }
static void unregister_winch(struct tty_struct *tty); static const struct tty_port_operations line_port_ops = {
.activate = line_activate,
};
void line_close(struct tty_struct *tty, struct file * filp) int line_open(struct tty_struct *tty, struct file *filp)
{ {
struct line *line = tty->driver_data; struct line *line = tty->driver_data;
/* return tty_port_open(&line->port, tty, filp);
* If line_open fails (and tty->driver_data is never set), }
* tty_open will call line_close. So just return in this case.
*/
if (line == NULL)
return;
/* We ignore the error anyway! */ int line_install(struct tty_driver *driver, struct tty_struct *tty,
flush_buffer(line); struct line *line)
{
int ret;
mutex_lock(&line->count_lock); ret = tty_standard_install(driver, tty);
BUG_ON(!line->valid); if (ret)
return ret;
if (--line->port.count) tty->driver_data = line;
goto out_unlock;
tty_port_tty_set(&line->port, NULL); return 0;
tty->driver_data = NULL; }
static void unregister_winch(struct tty_struct *tty);
void line_cleanup(struct tty_struct *tty)
{
struct line *line = tty->driver_data;
if (line->sigio) { if (line->sigio) {
unregister_winch(tty); unregister_winch(tty);
line->sigio = 0; line->sigio = 0;
} }
}
out_unlock: void line_close(struct tty_struct *tty, struct file * filp)
mutex_unlock(&line->count_lock); {
struct line *line = tty->driver_data;
tty_port_close(&line->port, tty, filp);
}
void line_hangup(struct tty_struct *tty)
{
struct line *line = tty->driver_data;
tty_port_hangup(&line->port);
} }
void close_lines(struct line *lines, int nlines) void close_lines(struct line *lines, int nlines)
...@@ -589,6 +576,7 @@ int register_lines(struct line_driver *line_driver, ...@@ -589,6 +576,7 @@ int register_lines(struct line_driver *line_driver,
for (i = 0; i < nlines; i++) { for (i = 0; i < nlines; i++) {
tty_port_init(&lines[i].port); tty_port_init(&lines[i].port);
lines[i].port.ops = &line_port_ops;
spin_lock_init(&lines[i].lock); spin_lock_init(&lines[i].lock);
mutex_init(&lines[i].count_lock); mutex_init(&lines[i].count_lock);
lines[i].driver = line_driver; lines[i].driver = line_driver;
......
...@@ -58,7 +58,11 @@ struct line { ...@@ -58,7 +58,11 @@ struct line {
}; };
extern void line_close(struct tty_struct *tty, struct file * filp); extern void line_close(struct tty_struct *tty, struct file * filp);
extern int line_open(struct line *lines, struct tty_struct *tty); extern int line_open(struct tty_struct *tty, struct file *filp);
extern int line_install(struct tty_driver *driver, struct tty_struct *tty,
struct line *line);
extern void line_cleanup(struct tty_struct *tty);
extern void line_hangup(struct tty_struct *tty);
extern int line_setup(char **conf, unsigned nlines, char **def, extern int line_setup(char **conf, unsigned nlines, char **def,
char *init, char *name); char *init, char *name);
extern int line_write(struct tty_struct *tty, const unsigned char *buf, extern int line_write(struct tty_struct *tty, const unsigned char *buf,
......
...@@ -87,19 +87,13 @@ static int ssl_remove(int n, char **error_out) ...@@ -87,19 +87,13 @@ static int ssl_remove(int n, char **error_out)
error_out); error_out);
} }
static int ssl_open(struct tty_struct *tty, struct file *filp) static int ssl_install(struct tty_driver *driver, struct tty_struct *tty)
{ {
int err = line_open(serial_lines, tty); return line_install(driver, tty, &serial_lines[tty->index]);
if (err)
printk(KERN_ERR "Failed to open serial line %d, err = %d\n",
tty->index, err);
return err;
} }
static const struct tty_operations ssl_ops = { static const struct tty_operations ssl_ops = {
.open = ssl_open, .open = line_open,
.close = line_close, .close = line_close,
.write = line_write, .write = line_write,
.put_char = line_put_char, .put_char = line_put_char,
...@@ -110,6 +104,9 @@ static const struct tty_operations ssl_ops = { ...@@ -110,6 +104,9 @@ static const struct tty_operations ssl_ops = {
.set_termios = line_set_termios, .set_termios = line_set_termios,
.throttle = line_throttle, .throttle = line_throttle,
.unthrottle = line_unthrottle, .unthrottle = line_unthrottle,
.install = ssl_install,
.cleanup = line_cleanup,
.hangup = line_hangup,
}; };
/* Changed by ssl_init and referenced by ssl_exit, which are both serialized /* Changed by ssl_init and referenced by ssl_exit, which are both serialized
......
...@@ -89,21 +89,17 @@ static int con_remove(int n, char **error_out) ...@@ -89,21 +89,17 @@ static int con_remove(int n, char **error_out)
return line_remove(vts, ARRAY_SIZE(vts), n, error_out); return line_remove(vts, ARRAY_SIZE(vts), n, error_out);
} }
static int con_open(struct tty_struct *tty, struct file *filp)
{
int err = line_open(vts, tty);
if (err)
printk(KERN_ERR "Failed to open console %d, err = %d\n",
tty->index, err);
return err;
}
/* Set in an initcall, checked in an exitcall */ /* Set in an initcall, checked in an exitcall */
static int con_init_done = 0; static int con_init_done = 0;
static int con_install(struct tty_driver *driver, struct tty_struct *tty)
{
return line_install(driver, tty, &vts[tty->index]);
}
static const struct tty_operations console_ops = { static const struct tty_operations console_ops = {
.open = con_open, .open = line_open,
.install = con_install,
.close = line_close, .close = line_close,
.write = line_write, .write = line_write,
.put_char = line_put_char, .put_char = line_put_char,
...@@ -114,6 +110,8 @@ static const struct tty_operations console_ops = { ...@@ -114,6 +110,8 @@ static const struct tty_operations console_ops = {
.set_termios = line_set_termios, .set_termios = line_set_termios,
.throttle = line_throttle, .throttle = line_throttle,
.unthrottle = line_unthrottle, .unthrottle = line_unthrottle,
.cleanup = line_cleanup,
.hangup = line_hangup,
}; };
static void uml_console_write(struct console *console, const char *string, static void uml_console_write(struct console *console, const char *string,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment