aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab <[email protected]>2019-01-10 17:11:39 +0000
committerPalmer Dabbelt <[email protected]>2019-01-23 23:41:50 +0000
commita19f74708ef693d7ddc3ee577a458b6807d43e5b (patch)
treeb25820af6e216476c7fa247a52c7239c7619fd82
parentRISC-V: defconfig: Add CRYPTO_DEV_VIRTIO=y (diff)
downloadkernel-a19f74708ef693d7ddc3ee577a458b6807d43e5b.tar.gz
kernel-a19f74708ef693d7ddc3ee577a458b6807d43e5b.zip
tty/serial: use uart_console_write in the RISC-V SBL early console
This enables proper NLCR processing. Suggested-by: Anup Patel <[email protected]> Signed-off-by: Andreas Schwab <[email protected]> Reviewed-by: Anup Patel <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
-rw-r--r--drivers/tty/serial/earlycon-riscv-sbi.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/tty/serial/earlycon-riscv-sbi.c b/drivers/tty/serial/earlycon-riscv-sbi.c
index e1a551aae336..ce81523c3113 100644
--- a/drivers/tty/serial/earlycon-riscv-sbi.c
+++ b/drivers/tty/serial/earlycon-riscv-sbi.c
@@ -10,13 +10,16 @@
#include <linux/serial_core.h>
#include <asm/sbi.h>
-static void sbi_console_write(struct console *con,
- const char *s, unsigned int n)
+static void sbi_putc(struct uart_port *port, int c)
{
- int i;
+ sbi_console_putchar(c);
+}
- for (i = 0; i < n; ++i)
- sbi_console_putchar(s[i]);
+static void sbi_console_write(struct console *con,
+ const char *s, unsigned n)
+{
+ struct earlycon_device *dev = con->data;
+ uart_console_write(&dev->port, s, n, sbi_putc);
}
static int __init early_sbi_setup(struct earlycon_device *device,