[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 06/11] target-arm: Allow secondary KVM CPUs to be
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v9 06/11] target-arm: Allow secondary KVM CPUs to be booted via PSCI |
Date: |
Fri, 22 Nov 2013 17:17:13 +0000 |
New ARM boards are generally expected to boot their secondary CPUs
via the PSCI interface, rather than ad-hoc "loop around in holding
pen code" as hw/arm/boot.c implements. In particular this is
necessary for mach-virt kernels. For KVM we achieve this by creating
the VCPUs with a feature flag marking them as starting in PSCI
powered-down state; the guest kernel will then make a PSCI call
(implemented in the host kernel) to start the secondaries at
an address of its choosing once it has got the primary CPU up.
Implement this setting of the feature flag, controlled by a
qdev property for ARMCPU, which board code can set if it is a
PSCI system.
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/cpu-qom.h | 3 +++
target-arm/cpu.c | 7 +++++++
target-arm/kvm.c | 3 +++
3 files changed, 13 insertions(+)
diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h
index cbb9eec..8bd3e36 100644
--- a/target-arm/cpu-qom.h
+++ b/target-arm/cpu-qom.h
@@ -94,6 +94,9 @@ typedef struct ARMCPU {
/* 'compatible' string for this CPU for Linux device trees */
const char *dtb_compatible;
+ /* Should CPU start in PSCI powered-off state? */
+ bool start_powered_off;
+
/* The instance init functions for implementation-specific subclasses
* set these fields to specify the implementation-dependent values of
* various constant registers and reset values of non-constant
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 4c8d9c7..0325815 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -20,6 +20,7 @@
#include "cpu.h"
#include "qemu-common.h"
+#include "hw/qdev-properties.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/loader.h"
#endif
@@ -944,6 +945,11 @@ static const ARMCPUInfo arm_cpus[] = {
#endif
};
+static Property arm_cpu_properties[] = {
+ DEFINE_PROP_BOOL("start-powered-off", ARMCPU, start_powered_off, false),
+ DEFINE_PROP_END_OF_LIST()
+};
+
static void arm_cpu_class_init(ObjectClass *oc, void *data)
{
ARMCPUClass *acc = ARM_CPU_CLASS(oc);
@@ -952,6 +958,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
acc->parent_realize = dc->realize;
dc->realize = arm_cpu_realizefn;
+ dc->props = arm_cpu_properties;
acc->parent_reset = cc->reset;
cc->reset = arm_cpu_reset;
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 3098456..80c58c5 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -79,6 +79,9 @@ int kvm_arch_init_vcpu(CPUState *cs)
init.target = KVM_ARM_TARGET_CORTEX_A15;
memset(init.features, 0, sizeof(init.features));
+ if (cpu->start_powered_off) {
+ init.features[0] = 1 << KVM_ARM_VCPU_POWER_OFF;
+ }
ret = kvm_vcpu_ioctl(cs, KVM_ARM_VCPU_INIT, &init);
if (ret) {
return ret;
--
1.7.9.5
- [Qemu-devel] [PATCH v9 09/11] target-arm: Don't hardcode KVM target CPU to be A15, (continued)
- [Qemu-devel] [PATCH v9 09/11] target-arm: Don't hardcode KVM target CPU to be A15, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 10/11] target-arm: Provide '-cpu host' when running KVM, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 03/11] hw/arm/boot: Allow boards to provide an fdt blob, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 04/11] target-arm: Provide PSCI constants to generic QEMU code, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 05/11] target-arm: Add ARMCPU field for Linux device-tree 'compatible' string, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 01/11] target-arm: Provide mechanism for getting KVM constants even if not CONFIG_KVM, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 11/11] hw/arm/virt: Support -cpu host, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 08/11] linux-headers: Update from mainline, Peter Maydell, 2013/11/22
- [Qemu-devel] [PATCH v9 06/11] target-arm: Allow secondary KVM CPUs to be booted via PSCI,
Peter Maydell <=
- [Qemu-devel] [PATCH v9 07/11] hw/arm: Add 'virt' platform, Peter Maydell, 2013/11/22
- Re: [Qemu-devel] [PATCH v9 00/11] target-arm: mach virt and -cpu host support, Christoffer Dall, 2013/11/22