Skip to content

Commit

Permalink
tty/serial: Add RISC-V SBI debug console based earlycon
Browse files Browse the repository at this point in the history
We extend the existing RISC-V SBI earlycon support to use the new
RISC-V SBI debug console extension.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
  • Loading branch information
avpatel authored and Björn Töpel committed Oct 12, 2023
1 parent 99ab454 commit 97862b9
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ config SERIAL_EARLYCON_SEMIHOST

config SERIAL_EARLYCON_RISCV_SBI
bool "Early console using RISC-V SBI"
depends on RISCV_SBI_V01
depends on RISCV_SBI
select SERIAL_CORE
select SERIAL_CORE_CONSOLE
select SERIAL_EARLYCON
Expand Down
32 changes: 28 additions & 4 deletions drivers/tty/serial/earlycon-riscv-sbi.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,41 @@ static void sbi_putc(struct uart_port *port, unsigned char c)
sbi_console_putchar(c);
}

static void sbi_console_write(struct console *con,
const char *s, unsigned n)
static void sbi_0_1_console_write(struct console *con,
const char *s, unsigned int n)
{
struct earlycon_device *dev = con->data;
uart_console_write(&dev->port, s, n, sbi_putc);
}

static void sbi_dbcn_console_write(struct console *con,
const char *s, unsigned int n)
{
phys_addr_t pa = __pa(s);

if (IS_ENABLED(CONFIG_32BIT))
sbi_ecall(SBI_EXT_DBCN, SBI_EXT_DBCN_CONSOLE_WRITE,
n, lower_32_bits(pa), upper_32_bits(pa), 0, 0, 0);
else
sbi_ecall(SBI_EXT_DBCN, SBI_EXT_DBCN_CONSOLE_WRITE,
n, pa, 0, 0, 0, 0);
}

static int __init early_sbi_setup(struct earlycon_device *device,
const char *opt)
{
device->con->write = sbi_console_write;
return 0;
int ret = 0;

if ((sbi_spec_version >= sbi_mk_version(2, 0)) &&
(sbi_probe_extension(SBI_EXT_DBCN) > 0)) {
device->con->write = sbi_dbcn_console_write;
} else {
if (IS_ENABLED(CONFIG_RISCV_SBI_V01))
device->con->write = sbi_0_1_console_write;
else
ret = -ENODEV;
}

return ret;
}
EARLYCON_DECLARE(sbi, early_sbi_setup);

0 comments on commit 97862b9

Please sign in to comment.