From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUxGw-0006wW-E0 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUxGq-0007YD-Gw for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:30 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:47009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUxGq-0007XH-Bi for qemu-devel@nongnu.org; Tue, 01 Apr 2014 07:54:24 -0400 Received: by mail-pa0-f44.google.com with SMTP id bj1so9724949pad.17 for ; Tue, 01 Apr 2014 04:54:23 -0700 (PDT) From: Pranavkumar Sawargaonkar Date: Tue, 1 Apr 2014 17:23:49 +0530 Message-Id: <1396353232-3835-4-git-send-email-pranavkumar@linaro.org> In-Reply-To: <1396353232-3835-1-git-send-email-pranavkumar@linaro.org> References: <1396353232-3835-1-git-send-email-pranavkumar@linaro.org> Subject: [Qemu-devel] [RFC PATCH V2 3/6] target-arm: Enable KVM_ARM_VCPU_PSCI_0_2 feature when possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Anup Patel , patches@apm.com, kvmarm@list.cs.columbia.edu, christoffer.dall@linaro.org, Pranavkumar Sawargaonkar Latest linux kernel supports in-kernel emulation of PSCI v0.2 but to enable it we need to select KVM_ARM_VCPU_PSCI_0_2 feature using KVM_ARM_VCPU_INIT ioctl. Also, we can use KVM_ARM_VCPU_PSCI_0_2 feature for VCPU only when linux kernel has KVM_CAP_ARM_PSCI_0_2 capability. This patch updates kvm_arch_init_vcpu() to enable KVM_ARM_VCPU_PSCI_0_2 feature for VCPU when KVM ARM/ARM64 has KVM_CAP_ARM_PSCI_0_2 capability. Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel --- target-arm/kvm32.c | 5 ++++- target-arm/kvm64.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c index a4fde07..afeff01 100644 --- a/target-arm/kvm32.c +++ b/target-arm/kvm32.c @@ -181,7 +181,10 @@ int kvm_arch_init_vcpu(CPUState *cs) init.target = cpu->kvm_target; memset(init.features, 0, sizeof(init.features)); if (cpu->start_powered_off) { - init.features[0] = 1 << KVM_ARM_VCPU_POWER_OFF; + init.features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF; + } + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + init.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } ret = kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init); if (ret) { diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c index 1b7ca90..02bba45 100644 --- a/target-arm/kvm64.c +++ b/target-arm/kvm64.c @@ -90,7 +90,10 @@ int kvm_arch_init_vcpu(CPUState *cs) init.target = cpu->kvm_target; memset(init.features, 0, sizeof(init.features)); if (cpu->start_powered_off) { - init.features[0] = 1 << KVM_ARM_VCPU_POWER_OFF; + init.features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF; + } + if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + init.features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } ret = kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init); -- 1.7.9.5