Re: [Qemu-devel] [PATCH] hw/arm/virt: mark timer in fdt as v8-compatible

[Claudio Fontana]

Hello Peter,

are you ok with this one?

Thanks,

Claudio

On 26 September 2014 15:09,  <address@hidden> wrote:
> From: Claudio Fontana <address@hidden>
>
> check if the first cpu is an armv8 cpu, and if so, put
> arm,armv8-timer in the compatible string list.
>
> Note that due to this check, this patch moves the creation
> of the timer fdt node to after the cpu creation loop.
>
> Signed-off-by: Claudio Fontana <address@hidden>
> ---
>  hw/arm/virt.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 8c6b171..eeb3105 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -239,14 +239,23 @@ static void fdt_add_timer_nodes(const VirtBoardInfo 
> *vbi)
>       * but for the GIC implementation provided by both QEMU and KVM
>       * they are edge-triggered.
>       */
> +    ARMCPU *armcpu;
>      uint32_t irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;
>
>      irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
>                           GIC_FDT_IRQ_PPI_CPU_WIDTH, (1 << vbi->smp_cpus) - 
> 1);
>
>      qemu_fdt_add_subnode(vbi->fdt, "/timer");
> -    qemu_fdt_setprop_string(vbi->fdt, "/timer",
> -                                "compatible", "arm,armv7-timer");
> +
> +    armcpu = ARM_CPU(qemu_get_cpu(0));
> +    if (arm_feature(&armcpu->env, ARM_FEATURE_V8)) {
> +        const char compat[] = "arm,armv7-timer\0arm,armv8-timer";
> +        qemu_fdt_setprop(vbi->fdt, "/timer", "compatible",
> +                         compat, sizeof(compat));
> +    } else {
> +        qemu_fdt_setprop_string(vbi->fdt, "/timer", "compatible",
> +                                "arm,armv7-timer");
> +    }
>      qemu_fdt_setprop_cells(vbi->fdt, "/timer", "interrupts",
>                                 GIC_FDT_IRQ_TYPE_PPI, 13, irqflags,
>                                 GIC_FDT_IRQ_TYPE_PPI, 14, irqflags,
> @@ -553,7 +562,6 @@ static void machvirt_init(MachineState *machine)
>      }
>
>      create_fdt(vbi);
> -    fdt_add_timer_nodes(vbi);
>
>      for (n = 0; n < smp_cpus; n++) {
>          ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
> @@ -577,6 +585,7 @@ static void machvirt_init(MachineState *machine)
>
>          object_property_set_bool(cpuobj, true, "realized", NULL);
>      }
> +    fdt_add_timer_nodes(vbi);
>      fdt_add_cpu_nodes(vbi);
>      fdt_add_psci_node(vbi);
>
> --
> 1.8.5.3
>