From patchwork Tue Sep 12 21:57:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 9950265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F98C602C9 for ; Tue, 12 Sep 2017 22:02:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A2920855 for ; Tue, 12 Sep 2017 22:02:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 349FF26E4E; Tue, 12 Sep 2017 22:02:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F23B20855 for ; Tue, 12 Sep 2017 22:02:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbdILWBb (ORCPT ); Tue, 12 Sep 2017 18:01:31 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34955 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbdILV54 (ORCPT ); Tue, 12 Sep 2017 17:57:56 -0400 Received: by mail-pg0-f67.google.com with SMTP id j16so3646566pga.2 for ; Tue, 12 Sep 2017 14:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=xICHrvcWMNtI8Zbg7gML48GNQQioscPoRuny4iJB6YQ=; b=Im3SOHMDD7oOUcnIVdLvbiUtGQIL95d8hPt9wl8JT5H9d0FzJ/Rrw6G2kXrw9h6Ikq 04kOcrS0dYwNCFplejhI1KlXBk0KlA0w4ha7GjF2o5B8oblqGBNCC9XCXQWRHh+dM1pT z9pxfer8FvxqQJtmoyvAdXz1juCtmMoccJ8Nqxulz54t/Ro3o937+yotmjknEVgKHIpI 9Pd2jlauE16bo6iWQDcWgSCSx7zBMipronKUnfteV2lXo/daVpP5M6REJqI6k4lMOWX+ CFaKE4e96i8KAD2zCVVof8562QHDnanWrM/+6HzTOkxHTSmCNKUR/+GysrAPz9FBvQHf m4xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=xICHrvcWMNtI8Zbg7gML48GNQQioscPoRuny4iJB6YQ=; b=ZcbpZNqbpFOhdEb/gGRaBHgeYFbD5TGhmMH4Tw31nsi8GcuK7RsFyj1y6wJolx+ZE/ s52/0lVN5Ydfnu/227swouKr5gZ+JUb8hz2JSzjHvEg19rGVMrSpHiMA4u6MxcHijj5z dTEe+MUX8q7Hiv+BY7YHqZ+VJsjersS4wuTp1M25EMjCfKoeYUVqnuphXUAI63W7pgpv sFVTafW0Ri/pyCg6PAAH86IhbNe27mfWWS0VkxO8F+EkNVZQNcy/JZJKjIqVEumOLhAS mUYBCwxrCG8eYk+LGxgz/FQD0Y4hSxwWPkqEhYtoQEOPX/KB/YSl2TXVhyKHrAAWn00h xCVQ== X-Gm-Message-State: AHPjjUhbPrtjDJMVvPcvDM7aRjdv0DFdAz+r3kYXicwcYHyl+7lcMHfr +ftUWzwXcTzC5Hb1 X-Google-Smtp-Source: ADKCNb4IPoScAG/6KV6KkDvcqhSkSZjxWzx5e1k6l727JeKiPCqQBQKp2JWhNntKhviHpjJfuZTnew== X-Received: by 10.98.16.80 with SMTP id y77mr15888659pfi.261.1505253476073; Tue, 12 Sep 2017 14:57:56 -0700 (PDT) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id c7sm13668103pfg.85.2017.09.12.14.57.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 14:57:54 -0700 (PDT) Subject: [PATCH v8 09/18] tty: New RISC-V SBI console driver Date: Tue, 12 Sep 2017 14:57:06 -0700 Message-Id: <20170912215715.4186-10-palmer@dabbelt.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170912215715.4186-1-palmer@dabbelt.com> References: <20170912215715.4186-1-palmer@dabbelt.com> Cc: yamada.masahiro@socionext.com, mmarek@suse.com, albert@sifive.com, will.deacon@arm.com, boqun.feng@gmail.com, oleg@redhat.com, mingo@redhat.com, daniel.lezcano@linaro.org, gregkh@linuxfoundation.org, jslaby@suse.com, davem@davemloft.net, mchehab@kernel.org, hverkuil@xs4all.nl, rdunlap@infradead.org, viro@zeniv.linux.org.uk, mhiramat@kernel.org, fweisbec@gmail.com, mcgrof@kernel.org, dledford@redhat.com, bart.vanassche@sandisk.com, sstabellini@kernel.org, mpe@ellerman.id.au, rmk+kernel@armlinux.org.uk, paul.gortmaker@windriver.com, nicolas.dichtel@6wind.com, linux@roeck-us.net, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, geert@linux-m68k.org, akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, jiri@mellanox.com, vgupta@synopsys.com, airlied@redhat.com, jk@ozlabs.org, chris@chris-wilson.co.uk, Jason@zx2c4.com, paulmck@linux.vnet.ibm.com, ncardwell@google.com, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, patches@groups.riscv.org, Palmer Dabbelt From: Palmer Dabbelt To: peterz@infradead.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, Arnd Bergmann , dmitriy@oss-tech.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The RISC-V ISA defines a simple console that is availiable via SBI calls on all systems. This patch adds a driver for this console interface that can act as both a target for early printk and as the system console. Signed-off-by: Palmer Dabbelt --- arch/riscv/include/asm/hvc_riscv_sbi.h | 25 ++++++++++ drivers/tty/hvc/Kconfig | 11 +++++ drivers/tty/hvc/Makefile | 1 + drivers/tty/hvc/hvc_riscv_sbi.c | 90 ++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 arch/riscv/include/asm/hvc_riscv_sbi.h create mode 100644 drivers/tty/hvc/hvc_riscv_sbi.c diff --git a/arch/riscv/include/asm/hvc_riscv_sbi.h b/arch/riscv/include/asm/hvc_riscv_sbi.h new file mode 100644 index 000000000000..d4f3cf0c17e9 --- /dev/null +++ b/arch/riscv/include/asm/hvc_riscv_sbi.h @@ -0,0 +1,25 @@ +/* + * RISC-V SBI console interface + * + * Copyright (C) 2017 SiFive + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _ASM_RISCV_HVC_RISCV_SBI_H +#define _ASM_RISCV_HVC_RISCV_SBI_H + +/* + * We always support CONFIG_EARLY_PRINTK via the SBI console driver because it + * works well enough that there's no penalty to doing so. + */ +extern struct console riscv_sbi_early_console_dev __initdata; + +#endif diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig index b8d5ea0ae26b..abe331761bdb 100644 --- a/drivers/tty/hvc/Kconfig +++ b/drivers/tty/hvc/Kconfig @@ -97,6 +97,17 @@ 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 + default y + 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 diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile index 6a2702be76d1..be497f9312d1 100644 --- a/drivers/tty/hvc/Makefile +++ b/drivers/tty/hvc/Makefile @@ -11,3 +11,4 @@ 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_HVCS) += hvcs.o +obj-$(CONFIG_HVC_RISCV_SBI) += hvc_riscv_sbi.o diff --git a/drivers/tty/hvc/hvc_riscv_sbi.c b/drivers/tty/hvc/hvc_riscv_sbi.c new file mode 100644 index 000000000000..2548d658e110 --- /dev/null +++ b/drivers/tty/hvc/hvc_riscv_sbi.c @@ -0,0 +1,90 @@ +/* + * RISC-V SBI interface to hvc_console.c + * based on drivers-tty/hvc/hvc_udbg.c + * + * Copyright (C) 2008 David Gibson, IBM Corporation + * Copyright (C) 2012 Regents of the University of California + * Copyright (C) 2017 SiFive + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include + +#include +#include + +#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++) { + if ((c = sbi_console_getchar()) < 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); + +static void sbi_console_write(struct console *co, const char *buf, + unsigned int n) +{ + int i; + + for (i = 0; i < n; ++i) { + if (buf[i] == '\n') + sbi_console_putchar('\r'); + sbi_console_putchar(buf[i]); + } +} + +struct console riscv_sbi_early_console_dev __initdata = { + .name = "early", + .write = sbi_console_write, + .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, + .index = -1 +};