From patchwork Mon Feb 8 18:53:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 580471 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 1A93B140B93 for ; Tue, 9 Feb 2016 05:54:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754905AbcBHSx6 (ORCPT ); Mon, 8 Feb 2016 13:53:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35676 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754771AbcBHSxv (ORCPT ); Mon, 8 Feb 2016 13:53:51 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 285735D; Mon, 8 Feb 2016 18:53:51 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-158.brq.redhat.com [10.34.1.158]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u18IrHb3006285; Mon, 8 Feb 2016 13:53:49 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: [kvm-unit-tests PATCH v2 13/14] powerpc/ppc64: add RTAS support Date: Mon, 8 Feb 2016 19:53:13 +0100 Message-Id: <1454957594-30601-14-git-send-email-drjones@redhat.com> In-Reply-To: <1454957594-30601-1-git-send-email-drjones@redhat.com> References: <1454957594-30601-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Add enough RTAS support to start adding RTAS commands. Just add power-off for now. Signed-off-by: Andrew Jones --- lib/powerpc/asm/rtas.h | 26 +++++++++++ lib/powerpc/io.c | 2 + lib/powerpc/rtas.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/ppc64/asm/rtas.h | 1 + powerpc/Makefile.common | 1 + 5 files changed, 150 insertions(+) create mode 100644 lib/powerpc/asm/rtas.h create mode 100644 lib/powerpc/rtas.c create mode 100644 lib/ppc64/asm/rtas.h diff --git a/lib/powerpc/asm/rtas.h b/lib/powerpc/asm/rtas.h new file mode 100644 index 0000000000000..522225bcb6de3 --- /dev/null +++ b/lib/powerpc/asm/rtas.h @@ -0,0 +1,26 @@ +#ifndef _ASMPOWERPC_RTAS_H_ +#define _ASMPOWERPC_RTAS_H_ +/* + * Copyright (C) 2016, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#include + +#define RTAS_UNKNOWN_SERVICE (-1) + +struct rtas_args { + u32 token; + u32 nargs; + u32 nret; + u32 args[16]; + u32 *rets; +}; + +extern void rtas_init(void); +extern int rtas_token(const char *service); +extern int rtas_call(int token, int nargs, int nret, int *outputs, ...); + +extern void rtas_power_off(void); + +#endif /* _ASMPOWERPC_RTAS_H_ */ diff --git a/lib/powerpc/io.c b/lib/powerpc/io.c index 5e1fa8dd96ab6..e57a28c583eb0 100644 --- a/lib/powerpc/io.c +++ b/lib/powerpc/io.c @@ -7,6 +7,7 @@ */ #include #include +#include extern void halt(int code); extern void putchar(int c); @@ -15,6 +16,7 @@ static struct spinlock uart_lock; void io_init(void) { + rtas_init(); } void puts(const char *s) diff --git a/lib/powerpc/rtas.c b/lib/powerpc/rtas.c new file mode 100644 index 0000000000000..7fcd667513087 --- /dev/null +++ b/lib/powerpc/rtas.c @@ -0,0 +1,120 @@ +/* + * powerpc RTAS + * + * Copyright (C) 2016, Red Hat Inc, Andrew Jones + * + * This work is licensed under the terms of the GNU LGPL, version 2. + */ +#include +#include +#include +#include +#include +#include + +#if defined(__powerpc64__) +struct func_ptr { + unsigned long ptr; + unsigned long toc; +}; +static struct func_ptr rtas_entry_funcptr; +#endif +typedef void (*rtas_entry_t)(unsigned long); +static rtas_entry_t enter_rtas; +static struct rtas_args rtas_args; +static struct spinlock lock; + +static int rtas_node(void) +{ + int node = fdt_path_offset(dt_fdt(), "/rtas"); + + if (node < 0) { + printf("%s: /rtas: %s\n", __func__, fdt_strerror(node)); + abort(); + } + + return node; +} + +void rtas_init(void) +{ + const struct fdt_property *prop; + unsigned long entry; + u32 *data; + int len; + + if (!dt_available()) { + printf("%s: No device tree!\n", __func__); + abort(); + } + + prop = fdt_get_property(dt_fdt(), rtas_node(), + "linux,rtas-entry", &len); + if (!prop) { + printf("%s: /rtas/linux,rtas-entry: %s\n", + __func__, fdt_strerror(len)); + abort(); + } + + data = (u32 *)prop->data; + entry = (unsigned long)fdt32_to_cpu(*data); + +#if defined(__powerpc64__) + rtas_entry_funcptr.ptr = entry; + enter_rtas = (rtas_entry_t)&rtas_entry_funcptr; +#else + enter_rtas = (rtas_entry_t)entry; +#endif +} + +int rtas_token(const char *service) +{ + const struct fdt_property *prop; + u32 *token; + + prop = fdt_get_property(dt_fdt(), rtas_node(), service, NULL); + if (prop) { + token = (u32 *)prop->data; + return fdt32_to_cpu(*token); + } + return RTAS_UNKNOWN_SERVICE; +} + +int rtas_call(int token, int nargs, int nret, int *outputs, ...) +{ + va_list list; + int ret, i; + + spin_lock(&lock); + + rtas_args.token = cpu_to_be32(token); + rtas_args.nargs = cpu_to_be32(nargs); + rtas_args.nret = cpu_to_be32(nret); + rtas_args.rets = &rtas_args.args[nargs]; + + va_start(list, outputs); + for (i = 0; i < nargs; ++i) + rtas_args.args[i] = cpu_to_be32(va_arg(list, u32)); + va_end(list); + + for (i = 0; i < nret; ++i) + rtas_args.rets[i] = 0; + + enter_rtas(__pa(&rtas_args)); + + if (nret > 1 && outputs != NULL) + for (i = 0; i < nret - 1; ++i) + outputs[i] = be32_to_cpu(rtas_args.rets[i + 1]); + + ret = nret > 0 ? be32_to_cpu(rtas_args.rets[0]) : 0; + + spin_unlock(&lock); + return ret; +} + +void rtas_power_off(void) +{ + printf("RTAS power-off returned %d\n", + rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1)); + assert(0); +} diff --git a/lib/ppc64/asm/rtas.h b/lib/ppc64/asm/rtas.h new file mode 100644 index 0000000000000..fe77f635cd860 --- /dev/null +++ b/lib/ppc64/asm/rtas.h @@ -0,0 +1 @@ +#include "../../powerpc/asm/rtas.h" diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 074f5672356b1..27b2bcad74865 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -34,6 +34,7 @@ cflatobjs += lib/powerpc/io.o cflatobjs += lib/powerpc/setup.o cflatobjs += lib/powerpc/mmu.o cflatobjs += lib/powerpc/smp.o +cflatobjs += lib/powerpc/rtas.o libgcc := $(shell $(CC) $(machine) --print-libgcc-file-name) start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) )))