From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org>, Liu Yu-B13201 <Yu.Liu@freescale.com>, Liu Yu <yu.liu@freescale.com>, Varun Sethi <Varun.Sethi@freescale.com>, Stuart Yoder <stuart.yoder@freescale.com> Subject: [PATCH 05/38] KVM: PPC: ev_idle hcall support for e500 guests Date: Wed, 15 Aug 2012 01:04:10 +0200 [thread overview] Message-ID: <1344985483-7440-6-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> From: Liu Yu-B13201 <Yu.Liu@freescale.com> Signed-off-by: Liu Yu <yu.liu@freescale.com> [varun: 64-bit changes] Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/include/asm/epapr_hcalls.h | 11 ++++++----- arch/powerpc/kernel/epapr_hcalls.S | 28 ++++++++++++++++++++++++++++ arch/powerpc/kernel/epapr_paravirt.c | 11 ++++++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h index c0c7adc..833ce2c 100644 --- a/arch/powerpc/include/asm/epapr_hcalls.h +++ b/arch/powerpc/include/asm/epapr_hcalls.h @@ -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 @@ -109,6 +105,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 * @@ -506,5 +507,5 @@ static inline unsigned int ev_idle(void) return r3; } - +#endif /* !__ASSEMBLY__ */ #endif diff --git a/arch/powerpc/kernel/epapr_hcalls.S b/arch/powerpc/kernel/epapr_hcalls.S index 697b390..62c0dc2 100644 --- a/arch/powerpc/kernel/epapr_hcalls.S +++ b/arch/powerpc/kernel/epapr_hcalls.S @@ -8,13 +8,41 @@ */ #include <linux/threads.h> +#include <asm/epapr_hcalls.h> #include <asm/reg.h> #include <asm/page.h> #include <asm/cputable.h> #include <asm/thread_info.h> #include <asm/ppc_asm.h> +#include <asm/asm-compat.h> #include <asm/asm-offsets.h> +/* epapr_ev_idle() was derived from e500_idle() */ +_GLOBAL(epapr_ev_idle) + CURRENT_THREAD_INFO(r3, r1) + PPC_LL r4, TI_LOCAL_FLAGS(r3) /* set napping bit */ + ori r4, r4,_TLF_NAPPING /* so when we take an exception */ + PPC_STL 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: diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c index 028aeae..f3eab85 100644 --- a/arch/powerpc/kernel/epapr_paravirt.c +++ b/arch/powerpc/kernel/epapr_paravirt.c @@ -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; -- 1.6.0.2
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org>, Liu Yu-B13201 <Yu.Liu@freescale.com>, Liu Yu <yu.liu@freescale.com>, Varun Sethi <Varun.Sethi@freescale.com>, Stuart Yoder <stuart.yoder@freescale.com> Subject: [PATCH 05/38] KVM: PPC: ev_idle hcall support for e500 guests Date: Tue, 14 Aug 2012 23:04:10 +0000 [thread overview] Message-ID: <1344985483-7440-6-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> From: Liu Yu-B13201 <Yu.Liu@freescale.com> Signed-off-by: Liu Yu <yu.liu@freescale.com> [varun: 64-bit changes] Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/include/asm/epapr_hcalls.h | 11 ++++++----- arch/powerpc/kernel/epapr_hcalls.S | 28 ++++++++++++++++++++++++++++ arch/powerpc/kernel/epapr_paravirt.c | 11 ++++++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h index c0c7adc..833ce2c 100644 --- a/arch/powerpc/include/asm/epapr_hcalls.h +++ b/arch/powerpc/include/asm/epapr_hcalls.h @@ -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 @@ -109,6 +105,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 * @@ -506,5 +507,5 @@ static inline unsigned int ev_idle(void) return r3; } - +#endif /* !__ASSEMBLY__ */ #endif diff --git a/arch/powerpc/kernel/epapr_hcalls.S b/arch/powerpc/kernel/epapr_hcalls.S index 697b390..62c0dc2 100644 --- a/arch/powerpc/kernel/epapr_hcalls.S +++ b/arch/powerpc/kernel/epapr_hcalls.S @@ -8,13 +8,41 @@ */ #include <linux/threads.h> +#include <asm/epapr_hcalls.h> #include <asm/reg.h> #include <asm/page.h> #include <asm/cputable.h> #include <asm/thread_info.h> #include <asm/ppc_asm.h> +#include <asm/asm-compat.h> #include <asm/asm-offsets.h> +/* epapr_ev_idle() was derived from e500_idle() */ +_GLOBAL(epapr_ev_idle) + CURRENT_THREAD_INFO(r3, r1) + PPC_LL r4, TI_LOCAL_FLAGS(r3) /* set napping bit */ + ori r4, r4,_TLF_NAPPING /* so when we take an exception */ + PPC_STL 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: diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c index 028aeae..f3eab85 100644 --- a/arch/powerpc/kernel/epapr_paravirt.c +++ b/arch/powerpc/kernel/epapr_paravirt.c @@ -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; -- 1.6.0.2
next prev parent reply other threads:[~2012-08-14 23:04 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-14 23:04 [PULL 00/38] ppc patch queue 2012-08-15 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 01/38] PPC: epapr: create define for return code value of success Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 02/38] KVM: PPC: use definitions in epapr header for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 03/38] KVM: PPC: add pvinfo for hcall opcodes on e500mc/e5500 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 04/38] KVM: PPC: Add support for ePAPR idle hcall in host kernel Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` Alexander Graf [this message] 2012-08-14 23:04 ` [PATCH 05/38] KVM: PPC: ev_idle hcall support for e500 guests Alexander Graf 2012-08-14 23:04 ` [PATCH 06/38] PPC: select EPAPR_PARAVIRT for all users of epapr hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 07/38] powerpc/fsl-soc: use CONFIG_EPAPR_PARAVIRT for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 08/38] PPC: Don't use hardcoded opcode for ePAPR hcall invocation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 09/38] KVM: PPC: PR: Use generic tracepoint for guest exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 10/38] KVM: PPC: Expose SYNC cap based on mmu notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 11/38] KVM: PPC: BookE: Expose remote TLB flushes in debugfs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 12/38] KVM: PPC: E500: Fix clear_tlb_refs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 13/38] KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 14/38] KVM: PPC: Quieten message about allocating linear regions Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 15/38] powerpc/epapr: export epapr_hypercall_start Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 16/38] KVM: PPC: BookE: Add check_requests helper function Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:20 ` Scott Wood 2012-08-15 0:20 ` Scott Wood 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-14 23:04 ` [PATCH 17/38] KVM: PPC: BookE: Add support for vcpu->mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:26 ` Alexander Graf 2012-08-15 0:26 ` Alexander Graf 2012-08-15 1:17 ` Scott Wood 2012-08-15 1:17 ` Scott Wood 2012-08-15 9:29 ` Alexander Graf 2012-08-15 9:29 ` Alexander Graf 2012-08-21 1:41 ` Scott Wood 2012-08-21 1:41 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-14 23:04 ` [PATCH 18/38] KVM: PPC: E500: Implement MMU notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:20 ` Scott Wood 2012-08-15 1:20 ` Scott Wood 2012-08-15 9:38 ` Alexander Graf 2012-08-15 9:38 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 19/38] KVM: PPC: Add cache flush on page map Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:23 ` Scott Wood 2012-08-15 1:23 ` Scott Wood 2012-08-15 9:52 ` Alexander Graf 2012-08-15 9:52 ` Alexander Graf 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:47 ` Scott Wood 2012-08-15 17:47 ` Scott Wood 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:58 ` Alexander Graf 2012-08-15 18:58 ` Alexander Graf 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:53 ` Scott Wood 2012-08-15 19:53 ` Scott Wood 2012-08-14 23:04 ` [PATCH 20/38] KVM: PPC: BookE: Add some more trace points Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 21/38] KVM: PPC: BookE: No duplicate request != 0 check Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 22/38] KVM: PPC: Use same kvmppc_prepare_to_enter code for booke and book3s_pr Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 23/38] KVM: PPC: Book3s: PR: Add (dumb) MMU Notifier support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 24/38] KVM: PPC: BookE: Drop redundant vcpu->mode set Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 25/38] KVM: PPC: Book3S: PR: Only do resched check once per exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 26/38] KVM: PPC: Exit guest context while handling exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 27/38] KVM: PPC: Book3S: PR: Indicate we're out of guest mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 28/38] KVM: PPC: Consistentify vcpu exit path Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 29/38] KVM: PPC: Book3S: PR: Rework irq disabling Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-09-28 0:52 ` Alexander Graf 2012-09-28 0:52 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 30/38] KVM: PPC: Move kvm_guest_enter call into generic code Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 31/38] KVM: PPC: Ignore EXITING_GUEST_MODE mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 32/38] KVM: PPC: Add return value in prepare_to_enter Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 33/38] KVM: PPC: Add return value to core_check_requests Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 34/38] KVM: PPC: booke: Add watchdog emulation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 35/38] booke: Added ONE_REG interface for IAC/DAC debug registers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:47 ` Alexander Graf 2012-08-14 23:47 ` Alexander Graf 2012-08-15 0:06 ` Scott Wood 2012-08-15 0:06 ` Scott Wood 2012-08-14 23:04 ` [PATCH 36/38] KVM: PPC: 44x: Initialize PVR Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 37/38] KVM: PPC: BookE: Add MCSR SPR support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 38/38] ppc: e500_tlb memset clears nothing Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:10 ` Avi Kivity 2012-08-15 10:10 ` Avi Kivity
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=1344985483-7440-6-git-send-email-agraf@suse.de \ --to=agraf@suse.de \ --cc=Varun.Sethi@freescale.com \ --cc=Yu.Liu@freescale.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=stuart.yoder@freescale.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.