From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhEjq-0006pU-EK for qemu-devel@nongnu.org; Mon, 05 May 2014 04:59:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhEji-0007Aa-Ax for qemu-devel@nongnu.org; Mon, 05 May 2014 04:59:06 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:50777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhEji-0007AK-6Z for qemu-devel@nongnu.org; Mon, 05 May 2014 04:58:58 -0400 Received: by mail-pa0-f54.google.com with SMTP id lf10so9004718pab.41 for ; Mon, 05 May 2014 01:58:57 -0700 (PDT) From: Pranavkumar Sawargaonkar Date: Mon, 5 May 2014 14:27:11 +0530 Message-Id: <1399280234-25036-4-git-send-email-pranavkumar@linaro.org> In-Reply-To: <1399280234-25036-1-git-send-email-pranavkumar@linaro.org> References: <1399280234-25036-1-git-send-email-pranavkumar@linaro.org> Subject: [Qemu-devel] [RFC PATCH V4 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, robherring2@gmail.com, kvmarm@lists.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 a690d99..cd9ac03 100644 --- a/target-arm/kvm32.c +++ b/target-arm/kvm32.c @@ -182,7 +182,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 e115879..bc6cd74 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