KVM: PPC: epapr: install ev_idle hcall for e500 guest
PATCH 3/4 KVM: PPC: epapr: install ev_idle hcall for e500 guest
From: Liu Yu-B13201 <[email protected]>
If the guest hypervisor node contains "has-idle" property.
Signed-off-by Liu Yu <[email protected]>
Signed-off-by Stuart Yoder <[email protected]>
--- arch/powerpc/include/asm/epapr_hcalls.h | 11 ++++++----- arch/powerpc/kernel/epapr_hcalls.S | 27 +++++++++++++++++++++++++++ arch/powerpc/kernel/epapr_paravirt.c | 11 ++++++++++- 3 files changed, 43 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/epapr_hcalls.h +6 -5
@@ -50,10 +50,6 @@#ifndef _EPAPR_HCALLS_H#define _EPAPR_HCALLS_H -#include <linux/types.h> -#include <linux/errno.h> -#include <asm/byteorder.h> -#define EV_BYTE_CHANNEL_SEND 1#define EV_BYTE_CHANNEL_RECEIVE 2#define EV_BYTE_CHANNEL_POLL 3
@@ -108,6 +104,11 @@#define EV_UNIMPLEMENTED 12/* Unimplemented hypercall */ #define EV_BUFFER_OVERFLOW 13/* Caller-supplied buffer too small */ +#ifndef __ASSEMBLY__ +#include <linux/types.h> +#include <linux/errno.h> +#include <asm/byteorder.h> +/* * Hypercall register clobber list *
@@ -500,5 +501,5 @@ static inline unsigned int ev_idle(void)return r3; } - +#endif /* !__ASSEMBLY__ */ #endif
arch/powerpc/kernel/epapr_hcalls.S +27 -0
@@ -8,6 +8,7 @@ */ #include <linux/threads.h> +#include <asm/epapr_hcalls.h> #include <asm/reg.h> #include <asm/page.h> #include <asm/cputable.h>
@@ -15,6 +16,32 @@ #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> +_GLOBAL(epapr_ev_idle) +epapr_ev_idle: + rlwinm r3,r1,0,0,31-THREAD_SHIFT /* current thread_info */ + lwz r4,TI_LOCAL_FLAGS(r3) /* set napping bit */ + ori r4,r4,_TLF_NAPPING /* so when we take an exception */ + stw r4,TI_LOCAL_FLAGS(r3) /* it will return to our caller */ + + wrteei 1 + +idle_loop: + LOAD_REG_IMMEDIATE(r11, EV_HCALL_TOKEN(EV_IDLE)) + +.global epapr_ev_idle_start +epapr_ev_idle_start: + li r3, -1 + nop + nop + nop + + /* + * Guard against spurious wakeups from a hypervisor -- + * only interrupt will cause us to return to LR due to + * _TLF_NAPPING. + */ + b idle_loop + /* Hypercall entry point. Will be patched with device tree instructions. */ .global epapr_hypercall_start epapr_hypercall_start:
arch/powerpc/kernel/epapr_paravirt.c +10 -1
@@ -21,6 +21,10 @@#include <asm/epapr_hcalls.h> #include <asm/cacheflush.h> #include <asm/code-patching.h> +#include <asm/machdep.h> + +extern void epapr_ev_idle (void ); +extern u32 epapr_ev_idle_start[];bool epapr_paravirt_enabled;
@@ -41,8 +45,13 @@ static int __init epapr_paravirt_init(void)if (len %4 || len > (4 *4 ))return -ENODEV ; -for (i =0 ; i < (len /4 ); i++) +for (i =0 ; i < (len /4 ); i++) {patch_instruction (epapr_hypercall_start + i, insts[i]); +patch_instruction (epapr_ev_idle_start + i, insts[i]); + } + +if (of_get_property (hyper_node,"has-idle" ,NULL )) + ppc_md.power_save = epapr_ev_idle; epapr_paravirt_enabled = true;
Signature · 1 line
1.7.3.4