From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMHEC-0005z2-KR for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:47:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMHE0-0002Zb-Cf for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:47:00 -0400 From: David Gibson Date: Thu, 11 Oct 2012 21:47:42 +1000 Message-Id: <1349956064-26709-7-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1349956064-26709-1-git-send-email-david@gibson.dropbear.id.au> References: <1349956064-26709-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 6/8] pseries: Return the token when we register an RTAS call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de Cc: Michael Ellerman , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson From: Michael Ellerman The kernel will soon be able to service some RTAS calls. However the choice of tokens will still be up to userspace. To support this have spapr_rtas_register() return the token that is allocated for an RTAS call, that allows the calling code to tell the kernel what the token value is. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- hw/spapr.h | 2 +- hw/spapr_rtas.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/spapr.h b/hw/spapr.h index 54960f3..f6864da 100644 --- a/hw/spapr.h +++ b/hw/spapr.h @@ -320,7 +320,7 @@ static inline void rtas_st(target_ulong phys, int n, uint32_t val) typedef void (*spapr_rtas_fn)(sPAPREnvironment *spapr, uint32_t token, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets); -void spapr_rtas_register(const char *name, spapr_rtas_fn fn); +int spapr_rtas_register(const char *name, spapr_rtas_fn fn); target_ulong spapr_rtas_call(sPAPREnvironment *spapr, uint32_t token, uint32_t nargs, target_ulong args, uint32_t nret, target_ulong rets); diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c index b96078b..38c105f 100644 --- a/hw/spapr_rtas.c +++ b/hw/spapr_rtas.c @@ -239,7 +239,7 @@ target_ulong spapr_rtas_call(sPAPREnvironment *spapr, return H_PARAMETER; } -void spapr_rtas_register(const char *name, spapr_rtas_fn fn) +int spapr_rtas_register(const char *name, spapr_rtas_fn fn) { int i; @@ -255,7 +255,7 @@ void spapr_rtas_register(const char *name, spapr_rtas_fn fn) rtas_next->name = name; rtas_next->fn = fn; - rtas_next++; + return (rtas_next++ - rtas_table) + TOKEN_BASE; } int spapr_rtas_device_tree_setup(void *fdt, target_phys_addr_t rtas_addr, -- 1.7.10.4