Re: [PATCH v3 4/8] xen/arm: Add support for DTBs with strange names of Hip04 GICv2

[Julien Grall <julien.grall@linaro.org>]

Hi Frediano,

On 11/05/2014 09:41 AM, Frediano Ziglio wrote:
> This name can appear in some Linux kernel repos. Not very fortunate,
> but to avoid others spending an hour to spot that few characters
> difference it worth to work around it.

Linux upstream is using "hisilicon,hip04-intc" to detect the hisilicon
interrupt controller. So it's not a workaround.

Which kernel is using the "*,hip04-gic"?

Regards,

> Signed-off-by: Zoltan Kiss <zoltan.kiss@huawei.com>
> ---
>  xen/arch/arm/gic-v2.c     | 1 +
>  xen/include/asm-arm/gic.h | 4 +++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
> index 3cb59dd..9ab30ce 100644
> --- a/xen/arch/arm/gic-v2.c
> +++ b/xen/arch/arm/gic-v2.c
> @@ -823,6 +823,7 @@ DT_DEVICE_END
>  static const char * const hip04_gicv2_dt_compat[] __initconst =
>  {
>      DT_COMPAT_GIC_HIP04,
> +    DT_COMPAT_GIC_HIP04_2,
>      NULL
>  };
>  
> diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
> index 5adb628..3d2b3db 100644
> --- a/xen/include/asm-arm/gic.h
> +++ b/xen/include/asm-arm/gic.h
> @@ -156,11 +156,13 @@
>  #define DT_COMPAT_GIC_CORTEX_A15     "arm,cortex-a15-gic"
>  #define DT_COMPAT_GIC_CORTEX_A7      "arm,cortex-a7-gic"
>  #define DT_COMPAT_GIC_HIP04          "hisilicon,hip04-gic"
> +#define DT_COMPAT_GIC_HIP04_2        "hisilicon,hip04-intc"
>  
>  #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \
>                          DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7), \
>                          DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400), \
> -                        DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04)
> +                        DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04), \
> +                        DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04_2)
>  
>  #define DT_COMPAT_GIC_V3             "arm,gic-v3"
>  
> 


-- 
Julien Grall