tty: Add SBI debug console support to HVC SBI driver

RISC-V SBI specification supports advanced debug console
support via SBI DBCN extension.

Extend the HVC SBI driver to support it.

Signed-off-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20231124070905.1043092-5-apatel@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Atish Patra 2023-11-24 12:39:04 +05:30 committed by Palmer Dabbelt
parent c77bf3607a
commit 88ead68e76
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
2 changed files with 32 additions and 9 deletions

View File

@ -108,7 +108,7 @@ config HVC_DCC_SERIALIZE_SMP
config HVC_RISCV_SBI config HVC_RISCV_SBI
bool "RISC-V SBI console support" bool "RISC-V SBI console support"
depends on RISCV_SBI_V01 depends on RISCV_SBI
select HVC_DRIVER select HVC_DRIVER
help help
This enables support for console output via RISC-V SBI calls, which This enables support for console output via RISC-V SBI calls, which

View File

@ -39,21 +39,44 @@ static int hvc_sbi_tty_get(uint32_t vtermno, char *buf, int count)
return i; return i;
} }
static const struct hv_ops hvc_sbi_ops = { static const struct hv_ops hvc_sbi_v01_ops = {
.get_chars = hvc_sbi_tty_get, .get_chars = hvc_sbi_tty_get,
.put_chars = hvc_sbi_tty_put, .put_chars = hvc_sbi_tty_put,
}; };
static int hvc_sbi_dbcn_tty_put(uint32_t vtermno, const char *buf, int count)
{
return sbi_debug_console_write(buf, count);
}
static int hvc_sbi_dbcn_tty_get(uint32_t vtermno, char *buf, int count)
{
return sbi_debug_console_read(buf, count);
}
static const struct hv_ops hvc_sbi_dbcn_ops = {
.put_chars = hvc_sbi_dbcn_tty_put,
.get_chars = hvc_sbi_dbcn_tty_get,
};
static int __init hvc_sbi_init(void) static int __init hvc_sbi_init(void)
{ {
return PTR_ERR_OR_ZERO(hvc_alloc(0, 0, &hvc_sbi_ops, 16)); int err;
}
device_initcall(hvc_sbi_init);
static int __init hvc_sbi_console_init(void) if (sbi_debug_console_available) {
{ err = PTR_ERR_OR_ZERO(hvc_alloc(0, 0, &hvc_sbi_dbcn_ops, 256));
hvc_instantiate(0, 0, &hvc_sbi_ops); if (err)
return err;
hvc_instantiate(0, 0, &hvc_sbi_dbcn_ops);
} else if (IS_ENABLED(CONFIG_RISCV_SBI_V01)) {
err = PTR_ERR_OR_ZERO(hvc_alloc(0, 0, &hvc_sbi_v01_ops, 256));
if (err)
return err;
hvc_instantiate(0, 0, &hvc_sbi_v01_ops);
} else {
return -ENODEV;
}
return 0; return 0;
} }
console_initcall(hvc_sbi_console_init); device_initcall(hvc_sbi_init);