diff options
| author | Pranavkumar Sawargaonkar <pranavkumar@linaro.org> | 2014-05-22 16:48:06 +0530 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 18:48:02 +0100 |
| commit | 8aae618737a6e7e515034590222e1e3c46e58598 (patch) | |
| tree | 5092f564354ad827e6318958e5cbd4c6baa74abe | |
| parent | 13ef37edfaed68fe0a152a8e21a965e7ddc50b5a (diff) | |
hw/arm/virt: Use PSCI v0.2 compatible string when KVM or TCG provides it
If we have PSCI v0.2 emulation available for KVM ARM/ARM64 or TCG then
we need to provide PSCI v0.2 compatible string via generated DTB.
Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
Signed-off-by: Anup Patel <anup.patel@linaro.org>
Message-id: 1400757486-2860-9-git-send-email-pranavkumar@linaro.org
| -rw-r--r-- | hw/arm/virt.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ea4f02d32e..442363cf10 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -180,10 +180,23 @@ static void create_fdt(VirtBoardInfo *vbi) "clk24mhz"); qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vbi->clock_phandle); +} + +static void fdt_add_psci_node(const VirtBoardInfo *vbi) +{ + void *fdt = vbi->fdt; + ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(0)); + /* No PSCI for TCG yet */ if (kvm_enabled()) { qemu_fdt_add_subnode(fdt, "/psci"); - qemu_fdt_setprop_string(fdt, "/psci", "compatible", "arm,psci"); + if (armcpu->psci_version == 2) { + const char comp[] = "arm,psci-0.2\0arm,psci"; + qemu_fdt_setprop(fdt, "/psci", "compatible", comp, sizeof(comp)); + } else { + qemu_fdt_setprop_string(fdt, "/psci", "compatible", "arm,psci"); + } + qemu_fdt_setprop_string(fdt, "/psci", "method", "hvc"); qemu_fdt_setprop_cell(fdt, "/psci", "cpu_suspend", PSCI_FN_CPU_SUSPEND); @@ -446,6 +459,7 @@ static void machvirt_init(QEMUMachineInitArgs *args) object_property_set_bool(cpuobj, true, "realized", NULL); } fdt_add_cpu_nodes(vbi); + fdt_add_psci_node(vbi); memory_region_init_ram(ram, NULL, "mach-virt.ram", args->ram_size); vmstate_register_ram_global(ram); |