Re: [Xen-devel] [PATCH v7 3/5] xen/arm: Update Dom0 GIC dt node with GICv3 information

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2014-07-11 at 18:21 +0530, vijay.kilari@xxxxxxxxx wrote:
> From: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx>
> 
> Update GIC device tree node for DOM0 with GICv3
> information. GIC hw specfic device tree information
> is moved to respective GIC driver.
> 
> Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@xxxxxxxxxxxxxxxxxx>
> Acked-by: Julien Grall <julien.grall@xxxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

I think this patch represents a bisection hazard, since the previous
patch will have enabled gic v3 for dom0 but it is not described until
this patch is applied. I think that's a tricky one to resolve so I
propose we ignore it so long as systems with GICv2 work fine at each
step, which I think should be the case.

> diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
> index d5a2fcf..51a0a26 100644
> --- a/xen/include/asm-arm/gic.h
> +++ b/xen/include/asm-arm/gic.h
> @@ -158,9 +158,9 @@
>  #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \
>                          DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7)
>  
> -#define DT_MATCH_GIC_V3_STRING1      "arm,gic-v3"
> +#define DT_COMPAT_GIC_V3             "arm,gic-v3"
>  
> -#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_MATCH_GIC_V3_STRING1);
> +#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_V3)

Ideally you would fold these renamings into the earlier patch which
introduced these in the first place.

Ian.



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel