evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: fiq_debugger: Update tty code for 3.9

Browse source 
Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Arve Hjønnevåg 2013-01-15 15:10:31 -08:00 • committed by John Stultz
parent a38d2154c8
commit f8b0ad9d7b
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
arch/arm/common/fiq_debugger.c
View file

@ -89,8 +89,7 @@ struct fiq_debugger_state {
#ifdef CONFIG_FIQ_DEBUGGER_CONSOLE #ifdef CONFIG_FIQ_DEBUGGER_CONSOLE
spinlock_t console_lock; spinlock_t console_lock;
struct console console; struct console console;
struct tty_struct *tty; struct tty_port tty_port;
int tty_open_count;
struct fiq_debugger_ringbuf *tty_rbuf; struct fiq_debugger_ringbuf *tty_rbuf;
bool syslog_dumping; bool syslog_dumping;
#endif #endif
@ -768,6 +767,22 @@ static irqreturn_t wakeup_irq_handler(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void debug_handle_console_irq_context(struct fiq_debugger_state *state)
{
#if defined(CONFIG_FIQ_DEBUGGER_CONSOLE)
if (state->tty_port.ops) {
int i;
int count = fiq_debugger_ringbuf_level(state->tty_rbuf);
for (i = 0; i < count; i++) {
int c = fiq_debugger_ringbuf_peek(state->tty_rbuf, 0);
tty_insert_flip_char(&state->tty_port, c, TTY_NORMAL);
if (!fiq_debugger_ringbuf_consume(state->tty_rbuf, 1))
pr_warn("fiq tty failed to consume byte\n");
}
tty_flip_buffer_push(&state->tty_port);
}
#endif
}
static void debug_handle_irq_context(struct fiq_debugger_state *state) static void debug_handle_irq_context(struct fiq_debugger_state *state)
{ {
@ -779,19 +794,7 @@ static void debug_handle_irq_context(struct fiq_debugger_state *state)
mod_timer(&state->sleep_timer, jiffies + HZ * 5); mod_timer(&state->sleep_timer, jiffies + HZ * 5);
spin_unlock_irqrestore(&state->sleep_timer_lock, flags); spin_unlock_irqrestore(&state->sleep_timer_lock, flags);
} }
#if defined(CONFIG_FIQ_DEBUGGER_CONSOLE) debug_handle_console_irq_context(state);
if (state->tty) {
int i;
int count = fiq_debugger_ringbuf_level(state->tty_rbuf);
for (i = 0; i < count; i++) {
int c = fiq_debugger_ringbuf_peek(state->tty_rbuf, 0);
tty_insert_flip_char(state->tty, c, TTY_NORMAL);
if (!fiq_debugger_ringbuf_consume(state->tty_rbuf, 1))
pr_warn("fiq tty failed to consume byte\n");
}
tty_flip_buffer_push(state->tty);
}
#endif
if (state->debug_busy) { if (state->debug_busy) {
debug_irq_exec(state, state->debug_cmd); debug_irq_exec(state, state->debug_cmd);
if (!state->console_enable) if (!state->console_enable)
@ -995,26 +998,21 @@ int fiq_tty_open(struct tty_struct *tty, struct file *filp)
int line = tty->index; int line = tty->index;
struct fiq_debugger_state **states = tty->driver->driver_state; struct fiq_debugger_state **states = tty->driver->driver_state;
struct fiq_debugger_state *state = states[line]; struct fiq_debugger_state *state = states[line];
if (state->tty_open_count++)
return 0;
tty->driver_data = state; return tty_port_open(&state->tty_port, tty, filp);
state->tty = tty;
return 0;
} }
void fiq_tty_close(struct tty_struct *tty, struct file *filp) void fiq_tty_close(struct tty_struct *tty, struct file *filp)
{ {
struct fiq_debugger_state *state = tty->driver_data; tty_port_close(tty->port, tty, filp);
if (--state->tty_open_count)
return;
state->tty = NULL;
} }
int fiq_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) int fiq_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)
{ {
int i; int i;
struct fiq_debugger_state *state = tty->driver_data; int line = tty->index;
struct fiq_debugger_state **states = tty->driver->driver_state;
struct fiq_debugger_state *state = states[line];
if (!state->console_enable) if (!state->console_enable)
return count; return count;
@ -1042,7 +1040,8 @@ static int fiq_tty_poll_init(struct tty_driver *driver, int line, char *options)
static int fiq_tty_poll_get_char(struct tty_driver *driver, int line) static int fiq_tty_poll_get_char(struct tty_driver *driver, int line)
{ {
struct fiq_debugger_state *state = driver->ttys[line]->driver_data; struct fiq_debugger_state **states = driver->driver_state;
struct fiq_debugger_state *state = states[line];
int c = NO_POLL_CHAR; int c = NO_POLL_CHAR;
debug_uart_enable(state); debug_uart_enable(state);
@ -1064,13 +1063,16 @@ static int fiq_tty_poll_get_char(struct tty_driver *driver, int line)
static void fiq_tty_poll_put_char(struct tty_driver *driver, int line, char ch) static void fiq_tty_poll_put_char(struct tty_driver *driver, int line, char ch)
{ {
struct fiq_debugger_state *state = driver->ttys[line]->driver_data; struct fiq_debugger_state **states = driver->driver_state;
struct fiq_debugger_state *state = states[line];
debug_uart_enable(state); debug_uart_enable(state);
debug_putc(state, ch); debug_putc(state, ch);
debug_uart_disable(state); debug_uart_disable(state);
} }
#endif #endif
static const struct tty_port_operations fiq_tty_port_ops;
static const struct tty_operations fiq_tty_driver_ops = { static const struct tty_operations fiq_tty_driver_ops = {
.write = fiq_tty_write, .write = fiq_tty_write,
.write_room = fiq_tty_write_room, .write_room = fiq_tty_write_room,
@ -1150,8 +1152,11 @@ static int fiq_debugger_tty_init_one(struct fiq_debugger_state *state)
goto err; goto err;
} }
tty_dev = tty_register_device(fiq_tty_driver, state->pdev->id, tty_port_init(&state->tty_port);
&state->pdev->dev); state->tty_port.ops = &fiq_tty_port_ops;
tty_dev = tty_port_register_device(&state->tty_port, fiq_tty_driver,
state->pdev->id, &state->pdev->dev);
if (IS_ERR(tty_dev)) { if (IS_ERR(tty_dev)) {
pr_err("Failed to register fiq debugger tty device\n"); pr_err("Failed to register fiq debugger tty device\n");
ret = PTR_ERR(tty_dev); ret = PTR_ERR(tty_dev);