From patchwork Tue Dec 13 07:10:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Evans X-Patchwork-Id: 131030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 61B9B1007D6 for ; Tue, 13 Dec 2011 18:10:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753445Ab1LMHKY (ORCPT ); Tue, 13 Dec 2011 02:10:24 -0500 Received: from ozlabs.org ([203.10.76.45]:48395 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093Ab1LMHKK (ORCPT ); Tue, 13 Dec 2011 02:10:10 -0500 Received: from localhost.localdomain (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 40F311007DB; Tue, 13 Dec 2011 18:10:09 +1100 (EST) From: Matt Evans To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: penberg@kernel.org, asias.hejun@gmail.com, levinsasha928@gmail.com, gorcunov@gmail.com, david@gibson.dropbear.id.au, aik@ozlabs.ru Subject: [PATCH V2 3/6] kvm tools: Add SPAPR PPC64 HV console Date: Tue, 13 Dec 2011 18:10:47 +1100 Message-Id: <1323760250-13237-4-git-send-email-matt@ozlabs.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1323760250-13237-1-git-send-email-matt@ozlabs.org> References: <1323760250-13237-1-git-send-email-matt@ozlabs.org> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org This adds the console code, plus VIO HV terminal nodes are added to the device tree so the guest kernel will pick it up. Signed-off-by: Matt Evans --- tools/kvm/Makefile | 1 + tools/kvm/powerpc/kvm.c | 33 ++++++++++++ tools/kvm/powerpc/spapr_hvcons.c | 102 ++++++++++++++++++++++++++++++++++++++ tools/kvm/powerpc/spapr_hvcons.h | 19 +++++++ 4 files changed, 155 insertions(+), 0 deletions(-) create mode 100644 tools/kvm/powerpc/spapr_hvcons.c create mode 100644 tools/kvm/powerpc/spapr_hvcons.h diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index e2a7190..0a576be 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -133,6 +133,7 @@ ifeq ($(uname_M), ppc64) OBJS += powerpc/kvm-cpu.o OBJS += powerpc/spapr_hcall.o OBJS += powerpc/spapr_rtas.o + OBJS += powerpc/spapr_hvcons.o ARCH_INCLUDE := powerpc/include CFLAGS += -m64 LIBS += -lfdt diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c index b3570a9..06fccef 100644 --- a/tools/kvm/powerpc/kvm.c +++ b/tools/kvm/powerpc/kvm.c @@ -15,6 +15,7 @@ #include "kvm/util.h" #include "spapr.h" +#include "spapr_hvcons.h" #include @@ -113,6 +114,8 @@ void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_ /* FIXME: SPAPR-specific */ hypercall_init(); register_core_rtas(); + /* Now that hypercalls are initialised, register a couple for the console: */ + spapr_hvcons_init(); } void kvm__irq_line(struct kvm *kvm, int irq, int level) @@ -126,6 +129,12 @@ void kvm__irq_trigger(struct kvm *kvm, int irq) kvm__irq_line(kvm, irq, 0); } +void kvm__arch_periodic_poll(struct kvm *kvm) +{ + /* FIXME: Should register callbacks to platform-specific polls */ + spapr_hvcons_poll(kvm); +} + int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *kernel_cmdline) { void *p; @@ -248,6 +257,13 @@ static void setup_fdt(struct kvm *kvm) _FDT(fdt_property(fdt, "linux,initrd-end", &ird_end_prop, sizeof(ird_end_prop))); } + + /* + * stdout-path: This is assuming we're using the HV console. Also, the + * address is hardwired until we do a VIO bus. + */ + _FDT(fdt_property_string(fdt, "linux,stdout-path", + "/vdevice/vty@30000000")); _FDT(fdt_end_node(fdt)); /* @@ -331,6 +347,23 @@ static void setup_fdt(struct kvm *kvm) } _FDT(fdt_end_node(fdt)); + /* + * VIO: See comment in linux,stdout-path; we don't yet represent a VIO + * bus/address allocation so addresses are hardwired here. + */ + _FDT(fdt_begin_node(fdt, "vdevice")); + _FDT(fdt_property_cell(fdt, "#address-cells", 0x1)); + _FDT(fdt_property_cell(fdt, "#size-cells", 0x0)); + _FDT(fdt_property_string(fdt, "device_type", "vdevice")); + _FDT(fdt_property_string(fdt, "compatible", "IBM,vdevice")); + _FDT(fdt_begin_node(fdt, "vty@30000000")); + _FDT(fdt_property_string(fdt, "name", "vty")); + _FDT(fdt_property_string(fdt, "device_type", "serial")); + _FDT(fdt_property_string(fdt, "compatible", "hvterm1")); + _FDT(fdt_property_cell(fdt, "reg", 0x30000000)); + _FDT(fdt_end_node(fdt)); + _FDT(fdt_end_node(fdt)); + /* Finalise: */ _FDT(fdt_end_node(fdt)); /* Root node */ _FDT(fdt_finish(fdt)); diff --git a/tools/kvm/powerpc/spapr_hvcons.c b/tools/kvm/powerpc/spapr_hvcons.c new file mode 100644 index 0000000..511dbe1 --- /dev/null +++ b/tools/kvm/powerpc/spapr_hvcons.c @@ -0,0 +1,102 @@ +/* + * SPAPR HV console + * + * Borrowed lightly from QEMU's spapr_vty.c, Copyright (c) 2010 David Gibson, + * IBM Corporation. + * + * Copyright (c) 2011 Matt Evans , IBM Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include "kvm/term.h" +#include "kvm/kvm.h" +#include "kvm/kvm-cpu.h" +#include "kvm/util.h" +#include "spapr.h" +#include "spapr_hvcons.h" + +#include +#include +#include + +#include + +union hv_chario { + struct { + uint64_t char0_7; + uint64_t char8_15; + } a; + uint8_t buf[16]; +}; + +static unsigned long h_put_term_char(struct kvm_cpu *vcpu, unsigned long opcode, unsigned long *args) +{ + /* To do: Read register from args[0], and check it. */ + unsigned long len = args[1]; + union hv_chario data; + struct iovec iov; + + if (len > 16) { + return H_PARAMETER; + } + data.a.char0_7 = cpu_to_be64(args[2]); + data.a.char8_15 = cpu_to_be64(args[3]); + + iov.iov_base = data.buf; + iov.iov_len = len; + do { + int ret; + + ret = term_putc_iov(CONSOLE_HV, &iov, 1, 0); + if (ret < 0) { + die("term_putc_iov error %d!\n", errno); + } + iov.iov_base += ret; + iov.iov_len -= ret; + } while (iov.iov_len > 0); + + return H_SUCCESS; +} + + +static unsigned long h_get_term_char(struct kvm_cpu *vcpu, unsigned long opcode, unsigned long *args) +{ + /* To do: Read register from args[0], and check it. */ + unsigned long *len = args + 0; + unsigned long *char0_7 = args + 1; + unsigned long *char8_15 = args + 2; + union hv_chario data; + struct iovec iov; + + if (term_readable(CONSOLE_HV, 0)) { + iov.iov_base = data.buf; + iov.iov_len = 16; + + *len = term_getc_iov(CONSOLE_HV, &iov, 1, 0); + *char0_7 = be64_to_cpu(data.a.char0_7); + *char8_15 = be64_to_cpu(data.a.char8_15); + } else { + *len = 0; + } + + return H_SUCCESS; +} + +void spapr_hvcons_poll(struct kvm *kvm) +{ + if (term_readable(CONSOLE_HV, 0)) { + /* + * We can inject an IRQ to guest here if we want. The guest + * will happily poll, though, so not required. + */ + } +} + +void spapr_hvcons_init(void) +{ + spapr_register_hypercall(H_PUT_TERM_CHAR, h_put_term_char); + spapr_register_hypercall(H_GET_TERM_CHAR, h_get_term_char); +} diff --git a/tools/kvm/powerpc/spapr_hvcons.h b/tools/kvm/powerpc/spapr_hvcons.h new file mode 100644 index 0000000..d3e4414 --- /dev/null +++ b/tools/kvm/powerpc/spapr_hvcons.h @@ -0,0 +1,19 @@ +/* + * SPAPR HV console + * + * Copyright (c) 2011 Matt Evans , IBM Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef spapr_hvcons_H +#define spapr_hvcons_H + +#include "kvm/kvm.h" + +void spapr_hvcons_init(void); +void spapr_hvcons_poll(struct kvm *kvm); + +#endif