[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 6/8] pseries: Return the token when we register an RTA
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 6/8] pseries: Return the token when we register an RTAS call |
Date: |
Thu, 11 Oct 2012 21:47:42 +1000 |
From: Michael Ellerman <address@hidden>
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 <address@hidden>
Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
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
- [Qemu-ppc] [0/8] Pending pseries patches, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 2/8] pseries: Clean up inconsistent variable name in xics.c, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 8/8] pseries: Add tracepoints to the XICS interrupt controller, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 5/8] pseries: Move XICS initialization before cpu initialization, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 4/8] pseries: Cleanup duplications of ics_valid_irq() code, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 6/8] pseries: Return the token when we register an RTAS call,
David Gibson <=
- [Qemu-ppc] [PATCH 3/8] pseries: Use #define for XICS base irq number, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 1/8] target-ppc: Extend FPU state for newer POWER CPUs, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 7/8] pseries: Allow RTAS tokens without a qemu handler, David Gibson, 2012/10/11