Re: [Qemu-devel] [PATCH V6 8/8] hw/arm/virt: Use PSCI v0.2 compatible string when KVM or TCG provides it

[Rob Herring]

On Thu, May 22, 2014 at 6:18 AM, Pranavkumar Sawargaonkar
<address@hidden> wrote:
> 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 <address@hidden>
> Signed-off-by: Anup Patel <address@hidden>

Reviewed-by: Rob Herring <address@hidden>

> ---
>  hw/arm/virt.c |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ea4f02d..442363c 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);
> --
> 1.7.9.5
>