From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 06/10] ARM/ARM64: KVM: Emulate PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET
Date: Sun, 16 Mar 2014 20:40:54 -0700 [thread overview]
Message-ID: <20140317034054.GG20648@cbox> (raw)
In-Reply-To: <1391686302-19451-7-git-send-email-anup.patel@linaro.org>
On Thu, Feb 06, 2014 at 05:01:38PM +0530, Anup Patel wrote:
> The PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET functions are system-level
> functions hence cannot be fully emulated by in-kernel PSCI emulation code.
>
> To tackle this, we forward PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET function
> calls from vcpu to user space (i.e. QEMU or KVMTOOL) via kvm_run structure
> using KVM_EXIT_SYSTEM_EVENT exit reasons.
>
> Signed-off-by: Anup Patel <anup.patel@linaro.org>
> Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
> ---
> arch/arm/kvm/psci.c | 32 +++++++++++++++++++++++++++++---
> 1 file changed, 29 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
> index 252acd0..1f1720a 100644
> --- a/arch/arm/kvm/psci.c
> +++ b/arch/arm/kvm/psci.c
> @@ -85,6 +85,23 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
> return KVM_PSCI_RET_SUCCESS;
> }
>
> +static inline void kvm_prepare_system_event(struct kvm_vcpu *vcpu, u32 type)
> +{
> + memset(&vcpu->run->system_event, 0, sizeof(vcpu->run->system_event));
> + vcpu->run->system_event.type = type;
> + vcpu->run->exit_reason = KVM_EXIT_SYSTEM_EVENT;
> +}
> +
> +static void kvm_psci_system_off(struct kvm_vcpu *vcpu)
> +{
> + kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_SHUTDOWN);
> +}
> +
> +static void kvm_psci_system_reset(struct kvm_vcpu *vcpu)
> +{
> + kvm_prepare_system_event(vcpu, KVM_SYSTEM_EVENT_RESET);
> +}
> +
> int kvm_psci_version(struct kvm_vcpu *vcpu)
> {
> if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features))
> @@ -95,6 +112,7 @@ int kvm_psci_version(struct kvm_vcpu *vcpu)
>
> static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
> {
> + int ret = 1;
> unsigned long psci_fn = *vcpu_reg(vcpu, 0) & ~((u32) 0);
> unsigned long val;
>
> @@ -114,13 +132,21 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
> case KVM_PSCI_0_2_FN64_CPU_ON:
> val = kvm_psci_vcpu_on(vcpu);
> break;
> + case KVM_PSCI_0_2_FN_SYSTEM_OFF:
> + kvm_psci_system_off(vcpu);
> + val = KVM_PSCI_RET_SUCCESS;
> + ret = 0;
> + break;
> + case KVM_PSCI_0_2_FN_SYSTEM_RESET:
> + kvm_psci_system_reset(vcpu);
> + val = KVM_PSCI_RET_SUCCESS;
> + ret = 0;
> + break;
> case KVM_PSCI_0_2_FN_CPU_SUSPEND:
> case KVM_PSCI_0_2_FN_AFFINITY_INFO:
> case KVM_PSCI_0_2_FN_MIGRATE:
> case KVM_PSCI_0_2_FN_MIGRATE_INFO_TYPE:
> case KVM_PSCI_0_2_FN_MIGRATE_INFO_UP_CPU:
> - case KVM_PSCI_0_2_FN_SYSTEM_OFF:
> - case KVM_PSCI_0_2_FN_SYSTEM_RESET:
> case KVM_PSCI_0_2_FN64_CPU_SUSPEND:
> case KVM_PSCI_0_2_FN64_AFFINITY_INFO:
> case KVM_PSCI_0_2_FN64_MIGRATE:
> @@ -132,7 +158,7 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu)
> }
>
> *vcpu_reg(vcpu, 0) = val;
> - return 1;
> + return ret;
> }
>
> static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu)
> --
> 1.7.9.5
>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
next prev parent reply other threads:[~2014-03-17 3:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 11:31 [PATCH v4 00/10] In-kernel PSCI v0.2 emulation for KVM ARM/ARM64 Anup Patel
2014-02-06 11:31 ` [PATCH v4 01/10] KVM: Add capability to advertise PSCI v0.2 support Anup Patel
2014-03-17 3:39 ` Christoffer Dall
2014-02-06 11:31 ` [PATCH v4 02/10] ARM/ARM64: KVM: Add base for PSCI v0.2 emulation Anup Patel
2014-02-07 8:28 ` Jungseok Lee
2014-02-07 8:36 ` Anup Patel
2014-02-07 9:07 ` Jungseok Lee
2014-02-07 9:26 ` Anup Patel
2014-02-07 23:37 ` Jungseok Lee
2014-02-07 23:42 ` Jungseok Lee
2014-03-14 22:57 ` Christoffer Dall
2014-03-17 3:40 ` Christoffer Dall
2014-03-17 6:14 ` Anup Patel
2014-03-19 13:22 ` Rob Herring
2014-02-06 11:31 ` [PATCH v4 03/10] KVM: Documentation: Add info regarding KVM_ARM_VCPU_PSCI_0_2 feature Anup Patel
2014-03-17 3:40 ` Christoffer Dall
2014-02-06 11:31 ` [PATCH v4 04/10] ARM/ARM64: KVM: Make kvm_psci_call() return convention more flexible Anup Patel
2014-03-17 3:40 ` Christoffer Dall
2014-02-06 11:31 ` [PATCH v4 05/10] KVM: Add KVM_EXIT_SYSTEM_EVENT to user space API header Anup Patel
2014-03-17 3:40 ` Christoffer Dall
2014-02-06 11:31 ` [PATCH v4 06/10] ARM/ARM64: KVM: Emulate PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET Anup Patel
2014-03-17 3:40 ` Christoffer Dall [this message]
2014-02-06 11:31 ` [PATCH v4 07/10] ARM/ARM64: KVM: Emulate PSCI v0.2 AFFINITY_INFO Anup Patel
2014-03-17 3:41 ` Christoffer Dall
2014-02-06 11:31 ` [PATCH v4 08/10] ARM/ARM64: KVM: Emulate PSCI v0.2 MIGRATE_INFO_TYPE and related functions Anup Patel
2014-03-17 3:41 ` Christoffer Dall
2014-03-17 6:16 ` Anup Patel
2014-02-06 11:31 ` [PATCH v4 09/10] ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 Anup Patel
2014-03-17 3:41 ` Christoffer Dall
2014-03-17 6:17 ` Anup Patel
2014-02-06 11:31 ` [PATCH v4 10/10] ARM/ARM64: KVM: Emulate PSCI v0.2 CPU_SUSPEND Anup Patel
2014-03-17 3:41 ` Christoffer Dall
2014-03-17 6:54 ` Anup Patel
2014-03-17 11:28 ` Mark Rutland
2014-03-17 17:49 ` Christoffer Dall
2014-03-17 3:39 ` [PATCH v4 00/10] In-kernel PSCI v0.2 emulation for KVM ARM/ARM64 Christoffer Dall
2014-03-17 6:11 ` Anup Patel
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=20140317034054.GG20648@cbox \
--to=christoffer.dall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).