Commit afa6b1cc authored by Palmer Dabbelt's avatar Palmer Dabbelt Committed by Greg Kroah-Hartman
Browse files

tty: New RISC-V SBI console driver 



The RISC-V ISA defines a simple console that is availiable via SBI calls
on all systems.  The SBI console is designed to be availiable at all
times, so while it's most natural to use this as an early printk target
it's also possible to use this as the system console when there isn't a
better one availiable.

This patch adds support for the RISC-V SBI console via the HVC
infastructure.  It's entirely independent from our early printk support,
which results in early boot messages appearing twice over the SBI
console.  As far as I can tell that's the fault of our early printk
support (we should support earlycon) as opposed to this driver.

There is one checkpatch.pl warning here: to check the MAINTAINERS file.
They're all matched by the "K: riscv" line.

Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6aed2a88

drivers/tty/hvc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -97,6 +97,16 @@ config HVC_BFIN_JTAG 
	 the HVC driver.  If you don't have JTAG, then you probably don't

	 want this option.



config HVC_RISCV_SBI

	bool "RISC-V SBI console support"

	depends on RISCV

	select HVC_DRIVER

	help

	  This enables support for console output via RISC-V SBI calls, which

	  is normally used only during boot to output printk.



	  If you don't know what do to here, say Y.



config HVCS

	tristate "IBM Hypervisor Virtual Console Server support"

	depends on PPC_PSERIES && HVC_CONSOLE

drivers/tty/hvc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o 
obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o

obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o

obj-$(CONFIG_HVC_BFIN_JTAG)	+= hvc_bfin_jtag.o

obj-$(CONFIG_HVC_RISCV_SBI)	+= hvc_riscv_sbi.o

obj-$(CONFIG_HVCS)		+= hvcs.o

drivers/tty/hvc/hvc_riscv_sbi.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/* 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);

	add_preferred_console("hvc", 0, NULL);



	return 0;

}

console_initcall(hvc_sbi_console_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE