f91253a3d0
The Linux kernel will auto-disables all boot consoles whenever it
gets a preferred real console.
Currently on RISC-V systems, if we have a real console which is not
RISCV SBI console then boot consoles (such as earlycon=sbi) are not
auto-disabled when a real console (ttyS0 or ttySIF0) is available.
This results in duplicate prints at boot-time after kernel starts
using real console (i.e. ttyS0 or ttySIF0) if "earlycon=" kernel
parameter was passed by bootloader.
The reason for above issue is that RISCV SBI console always adds
itself as preferred console which is causing other real consoles
to be not used as preferred console.
Ideally "console=" kernel parameter passed by bootloaders should
be the one selecting a preferred real console.
This patch fixes above issue by not forcing RISCV SBI console as
preferred console.
Fixes: afa6b1ccfa ("tty: New RISC-V SBI console driver")
Cc: stable@vger.kernel.org
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
60 lines
1.1 KiB
C
60 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2008 David Gibson, IBM Corporation
|
|
* Copyright (C) 2012 Regents of the University of California
|
|
* Copyright (C) 2017 SiFive
|
|
*/
|
|
|
|
#include <linux/console.h>
|
|
#include <linux/err.h>
|
|
#include <linux/init.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/sbi.h>
|
|
|
|
#include "hvc_console.h"
|
|
|
|
static int hvc_sbi_tty_put(uint32_t vtermno, const char *buf, int count)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < count; i++)
|
|
sbi_console_putchar(buf[i]);
|
|
|
|
return i;
|
|
}
|
|
|
|
static int hvc_sbi_tty_get(uint32_t vtermno, char *buf, int count)
|
|
{
|
|
int i, c;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
c = sbi_console_getchar();
|
|
if (c < 0)
|
|
break;
|
|
buf[i] = c;
|
|
}
|
|
|
|
return i;
|
|
}
|
|
|
|
static const struct hv_ops hvc_sbi_ops = {
|
|
.get_chars = hvc_sbi_tty_get,
|
|
.put_chars = hvc_sbi_tty_put,
|
|
};
|
|
|
|
static int __init hvc_sbi_init(void)
|
|
{
|
|
return PTR_ERR_OR_ZERO(hvc_alloc(0, 0, &hvc_sbi_ops, 16));
|
|
}
|
|
device_initcall(hvc_sbi_init);
|
|
|
|
static int __init hvc_sbi_console_init(void)
|
|
{
|
|
hvc_instantiate(0, 0, &hvc_sbi_ops);
|
|
|
|
return 0;
|
|
}
|
|
console_initcall(hvc_sbi_console_init);
|