[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

On 05/11/14 14:52, Stefano Stabellini wrote:
On Wed, 5 Nov 2014, Julien Grall wrote:
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"?

Good question, but what really matters is the string that u-boot (or any
other firmware/bootloader) is going to use, right? So, which one is it?
We are using the DTB from the kernel source, even when loading a bare metal kernel. I've looked around, the *gic version seems to exist only in internal repos, as far as I can see. Including the one Frediano started to use for porting. Therefore, I don't insist to keep both, but as I mentioned in the commit message, it would still provide some benefit, and given that it's just a 3 line change which just extend a few listings, I think we should keep it. Of course with a different commit message, which clears that this is the official name of it.


Signed-off-by: Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
  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 =

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"

                          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

Xen-devel mailing list

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.