Commit 7cd62e53 authored Jun 19, 2014 by Pranavkumar Sawargaonkar Committed by Peter Maydell Jun 19, 2014

target-arm: Enable KVM_ARM_VCPU_PSCI_0_2 feature when possible



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 <pranavkumar@linaro.org>
Signed-off-by: Anup Patel <anup.patel@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1402901605-24551-6-git-send-email-pranavkumar@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parent 228d5e04

target-arm/kvm32.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,9 @@ int kvm_arch_init_vcpu(CPUState *cs)
		if (cpu->start_powered_off) {
		cpu->kvm_init_features[0] \|= 1 << KVM_ARM_VCPU_POWER_OFF;
		}
		if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) {
		cpu->kvm_init_features[0] \|= 1 << KVM_ARM_VCPU_PSCI_0_2;
		}

		/* Do KVM_ARM_VCPU_INIT ioctl */
		ret = kvm_arm_vcpu_init(cs);

target-arm/kvm64.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,9 @@ int kvm_arch_init_vcpu(CPUState *cs)
		if (cpu->start_powered_off) {
		cpu->kvm_init_features[0] \|= 1 << KVM_ARM_VCPU_POWER_OFF;
		}
		if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) {
		cpu->kvm_init_features[0] \|= 1 << KVM_ARM_VCPU_PSCI_0_2;
		}

		/* Do KVM_ARM_VCPU_INIT ioctl */
		ret = kvm_arm_vcpu_init(cs);