[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] arm/virt: enable PSCI emulation support for sys
From: |
Rob Herring |
Subject: |
[Qemu-devel] [PATCH 6/7] arm/virt: enable PSCI emulation support for system emulation |
Date: |
Mon, 5 May 2014 11:00:22 -0500 |
From: Rob Herring <address@hidden>
Now that we have PSCI emulation, enable it for the virt platform.
This simplifies the virt machine a bit now that PSCI and SMP no longer
need to be KVM only features.
Signed-off-by: Rob Herring <address@hidden>
---
Note: This will need to be rebased as comments on KVM PSCI 0.2 support
are addressed. This patch effectively includes my comments.
hw/arm/virt.c | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9f28c12..d8ab88d 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -181,21 +181,22 @@ static void create_fdt(VirtBoardInfo *vbi)
"clk24mhz");
qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vbi->clock_phandle);
- /* No PSCI for TCG yet */
- if (kvm_enabled()) {
- qemu_fdt_add_subnode(fdt, "/psci");
- if (kvm_check_extension(kvm_state, KVM_CAP_ARM_PSCI_0_2)) {
- qemu_fdt_setprop_string(fdt, "/psci", "compatible",
"arm,psci-0.2");
- } else {
- qemu_fdt_setprop_string(fdt, "/psci", "compatible", "arm,psci");
- qemu_fdt_setprop_cell(fdt, "/psci", "cpu_suspend",
- PSCI_FN_CPU_SUSPEND);
- qemu_fdt_setprop_cell(fdt, "/psci", "cpu_off", PSCI_FN_CPU_OFF);
- qemu_fdt_setprop_cell(fdt, "/psci", "cpu_on", PSCI_FN_CPU_ON);
- qemu_fdt_setprop_cell(fdt, "/psci", "migrate", PSCI_FN_MIGRATE);
- }
- qemu_fdt_setprop_string(fdt, "/psci", "method", "hvc");
+ qemu_fdt_add_subnode(fdt, "/psci");
+ qemu_fdt_setprop_string(fdt, "/psci", "method", "hvc");
+ if (kvm_enabled() && !kvm_check_extension(kvm_state,
KVM_CAP_ARM_PSCI_0_2)) {
+ qemu_fdt_setprop_string(fdt, "/psci", "compatible", "arm,psci");
+ } else {
+ const char compat[] = "arm,psci-0.2\0arm,psci";
+ qemu_fdt_setprop(fdt, "/psci", "compatible", compat, sizeof(compat));
}
+ qemu_fdt_setprop_cell(fdt, "/psci", "cpu_suspend",
+ QEMU_PSCI_FN_CPU_SUSPEND);
+ qemu_fdt_setprop_cell(fdt, "/psci", "cpu_off",
+ QEMU_PSCI_FN_CPU_OFF);
+ qemu_fdt_setprop_cell(fdt, "/psci", "cpu_on",
+ QEMU_PSCI_FN_CPU_ON);
+ qemu_fdt_setprop_cell(fdt, "/psci", "migrate",
+ QEMU_PSCI_FN_MIGRATE);
}
static void fdt_add_timer_nodes(const VirtBoardInfo *vbi)
@@ -410,16 +411,6 @@ static void machvirt_init(QEMUMachineInitArgs *args)
vbi->smp_cpus = smp_cpus;
- /*
- * Only supported method of starting secondary CPUs is PSCI and
- * PSCI is not yet supported with TCG, so limit smp_cpus to 1
- * if we're not using KVM.
- */
- if (!kvm_enabled() && smp_cpus > 1) {
- error_report("mach-virt: must enable KVM to use multiple CPUs");
- exit(1);
- }
-
if (args->ram_size > vbi->memmap[VIRT_MEM].size) {
error_report("mach-virt: cannot model more than 30GB RAM");
exit(1);
@@ -438,6 +429,9 @@ static void machvirt_init(QEMUMachineInitArgs *args)
}
cpuobj = object_new(object_class_get_name(oc));
+ object_property_set_int(cpuobj, QEMU_PSCI_METHOD_HVC, "psci-method",
+ NULL);
+
/* Secondary CPUs start in PSCI powered-down state */
if (n > 0) {
object_property_set_bool(cpuobj, true, "start-powered-off", NULL);
--
1.9.1
[Qemu-devel] [PATCH 4/7] target-arm: support AArch64 for arm_cpu_set_pc, Rob Herring, 2014/05/05