From: Thomas Huth <thuth@redhat.com> To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: Re: [kvm-unit-tests PATCH v2 13/14] powerpc/ppc64: add RTAS support Date: Fri, 12 Feb 2016 18:51:51 +0100 [thread overview] Message-ID: <56BE1BB7.7030707@redhat.com> (raw) In-Reply-To: <1454957594-30601-14-git-send-email-drjones@redhat.com> On 08.02.2016 19:53, Andrew Jones wrote: > Add enough RTAS support to start adding RTAS commands. Just add > power-off for now. > > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > 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/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 <drjones@redhat.com> > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include <libcflat.h> > +#include <libfdt/libfdt.h> > +#include <devicetree.h> > +#include <asm/spinlock.h> > +#include <asm/io.h> > +#include <asm/rtas.h> > + > +#if defined(__powerpc64__) > +struct func_ptr { > + unsigned long ptr; > + unsigned long toc; Theoretically, there should be a third value "env" or so here (see <http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi.html#FUNC-DES>), but for C-code it likely does not matter. > +}; > +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); > +} As discussed in IRC already, that assert() can cause an endless loop... but apart from that, the patch looks fine to me. Thomas
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Huth <thuth@redhat.com> To: Andrew Jones <drjones@redhat.com>, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: Re: [kvm-unit-tests PATCH v2 13/14] powerpc/ppc64: add RTAS support Date: Fri, 12 Feb 2016 17:51:51 +0000 [thread overview] Message-ID: <56BE1BB7.7030707@redhat.com> (raw) In-Reply-To: <1454957594-30601-14-git-send-email-drjones@redhat.com> On 08.02.2016 19:53, Andrew Jones wrote: > Add enough RTAS support to start adding RTAS commands. Just add > power-off for now. > > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > 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/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 <drjones@redhat.com> > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include <libcflat.h> > +#include <libfdt/libfdt.h> > +#include <devicetree.h> > +#include <asm/spinlock.h> > +#include <asm/io.h> > +#include <asm/rtas.h> > + > +#if defined(__powerpc64__) > +struct func_ptr { > + unsigned long ptr; > + unsigned long toc; Theoretically, there should be a third value "env" or so here (see <http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi.html#FUNC-DES>), but for C-code it likely does not matter. > +}; > +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); > +} As discussed in IRC already, that assert() can cause an endless loop... but apart from that, the patch looks fine to me. Thomas
next prev parent reply other threads:[~2016-02-12 17:51 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-08 18:53 [kvm-unit-tests PATCH v2 00/14] ppc64: initial drop Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 01/14] lib: asm-generic: add missing casts Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 12:05 ` Thomas Huth 2016-02-12 12:05 ` Thomas Huth 2016-02-12 13:58 ` Andrew Jones 2016-02-12 13:58 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 02/14] lib: share arm-selftest utility functions Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 12:40 ` Thomas Huth 2016-02-12 12:40 ` Thomas Huth 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 03/14] config: no need to mix arch makefiles Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 04/14] powerpc/ppc64: start skeleton framework Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 05/14] powerpc/pp64: ppc-ify makefiles and linker script Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-09 17:54 ` [kvm-unit-tests PATCH] align toc to 256 bytes Andrew Jones 2016-02-09 17:54 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 06/14] powerpc/ppc64: add boot rom source Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 6:27 ` Thomas Huth 2016-02-12 6:27 ` Thomas Huth 2016-02-12 10:07 ` Andrew Jones 2016-02-12 10:07 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 07/14] powerpc/ppc64: add bootloader to bounce into memory Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 08/14] powerpc/ppc64: add HV putchar Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 17:08 ` Thomas Huth 2016-02-12 17:08 ` Thomas Huth 2016-02-12 17:45 ` Thomas Huth 2016-02-12 17:45 ` Thomas Huth 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 09/14] powerpc/ppc64: adapt arm's setup Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 11:50 ` Thomas Huth 2016-02-12 11:50 ` Thomas Huth 2016-02-12 13:59 ` Andrew Jones 2016-02-12 13:59 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 10/14] powerpc/ppc64: relocate linker VMAs Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 11/14] powerpc/ppc64: add run script and unittests.cfg Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 12/14] mkstandalone: add support for powerpc Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 13/14] powerpc/ppc64: add RTAS support Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 17:51 ` Thomas Huth [this message] 2016-02-12 17:51 ` Thomas Huth 2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 14/14] powerpc/ppc64: HACK: make a fake debug-exit Andrew Jones 2016-02-08 18:53 ` Andrew Jones 2016-02-12 18:07 ` Thomas Huth 2016-02-12 18:07 ` Thomas Huth 2016-02-12 22:50 ` Paolo Bonzini 2016-02-12 22:50 ` Paolo Bonzini 2016-02-09 17:49 ` [kvm-unit-tests PATCH v2 00/14] ppc64: initial drop Andrew Jones 2016-02-09 17:49 ` Andrew Jones 2016-02-10 14:27 ` Paolo Bonzini 2016-02-10 14:27 ` Paolo Bonzini 2016-02-11 11:56 ` Andrew Jones 2016-02-11 11:56 ` Andrew Jones 2016-02-11 12:36 ` Paolo Bonzini 2016-02-11 12:36 ` Paolo Bonzini 2016-02-11 13:36 ` Laurent Vivier 2016-02-11 13:36 ` Laurent Vivier 2016-02-11 15:29 ` Andrew Jones 2016-02-11 15:29 ` Andrew Jones 2016-02-11 16:44 ` Laurent Vivier 2016-02-11 16:44 ` Laurent Vivier 2016-02-11 17:22 ` Andrew Jones 2016-02-11 17:22 ` Andrew Jones 2016-02-11 17:47 ` Laurent Vivier 2016-02-11 17:47 ` Laurent Vivier 2016-02-12 10:06 ` Andrew Jones 2016-02-12 10:06 ` Andrew Jones 2016-02-12 10:31 ` Laurent Vivier 2016-02-12 10:31 ` Laurent Vivier 2016-02-12 10:57 ` Andrew Jones 2016-02-12 10:57 ` Andrew Jones 2016-02-12 13:44 ` Andrew Jones 2016-02-12 13:44 ` Andrew Jones 2016-02-14 22:43 ` David Gibson 2016-02-14 22:43 ` David Gibson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=56BE1BB7.7030707@redhat.com \ --to=thuth@redhat.com \ --cc=agraf@suse.de \ --cc=david@gibson.dropbear.id.au \ --cc=dgibson@redhat.com \ --cc=drjones@redhat.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=lvivier@redhat.com \ --cc=pbonzini@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.