From: Graf Yang <graf.yang@xxxxxxxxxx> Signed-off-by: Graf Yang <graf.yang@xxxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> --- drivers/serial/bfin_5xx.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index d63fad7..aea3a53 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c @@ -21,6 +21,7 @@ #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial_core.h> +#include <stdarg.h> #if defined(CONFIG_KGDB_SERIAL_CONSOLE) || \ defined(CONFIG_KGDB_SERIAL_CONSOLE_MODULE) @@ -1106,7 +1107,8 @@ static __init void early_serial_putc(struct uart_port *port, int ch) struct bfin_serial_port *uart = (struct bfin_serial_port *)port; while ((!(UART_GET_LSR(uart) & THRE)) && --timeout) - cpu_relax(); + barrier(); + UART_PUT_CHAR(uart, ch); } @@ -1155,6 +1157,49 @@ struct console __init *bfin_earlyserial_init(unsigned int port, #endif /* CONFIG_SERIAL_BFIN_CONSOLE */ +#ifdef CONFIG_DEBUG_KERNEL +void bfin_serial_debug(const char *fmt, ...) +{ + struct bfin_serial_port *uart = &bfin_serial_ports[0]; + unsigned short status, tmp; + int flags, i, count; + char buf[128]; + va_list ap; + + if (bfin_serial_console.index < 0) + return; /* Too early. */ + + va_start(ap, fmt); + vsprintf(buf, fmt, ap); + va_end(ap); + count = strlen(buf); + + spin_lock_irqsave(&uart->port.lock, flags); + + for (i = 0; i < count; i++) { + do { + status = UART_GET_LSR(uart); + } while (!(status & THRE)); + +#ifndef CONFIG_BF54x + tmp = UART_GET_LCR(uart); + tmp &= ~DLAB; + UART_PUT_LCR(uart, tmp); +#endif + UART_PUT_CHAR(uart, buf[i]); + if (buf[i] == '\n') { + do { + status = UART_GET_LSR(uart); + } while (!(status & THRE)); + UART_PUT_CHAR(uart, '\r'); + } + } + + spin_unlock_irqrestore(&uart->port.lock, flags); +} +EXPORT_SYMBOL(bfin_serial_debug); +#endif + static struct uart_driver bfin_serial_reg = { .owner = THIS_MODULE, .driver_name = "bfin-uart", -- 1.5.6 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html