build: convert HAS_GICV3 use to Kconfig

Use the Kconfig generated CONFIG_HAS_GICV3 defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/arm64.mk b/config/arm64.mk
index 4b8fdf669a5ac833acb6b50049c09c802d90c2a4..5a8e534b6ba68ee2f40965efe8141aeba115e2a2 100644 (file)
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -6,8 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX :=
 
 CFLAGS += #-marm -march= -mcpu= etc
 
-HAS_GICV3 := y
-
 # Use only if calling $(LD) directly.
 LDFLAGS_DIRECT += -EL
 

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index ec176a6ed3f78a504528715f3dcefb2b65b385a4..2cab17b81030c93b0ba0d245519ffa9c8414d461 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -13,6 +13,7 @@ config ARM_32
 config ARM_64
        def_bool y
        depends on 64BIT
+       select HAS_GICV3
 
 config ARM
        def_bool y
@@ -30,6 +31,10 @@ config ARCH_DEFCONFIG
 
 menu "Architecture Features"
 
+# Select HAS_GICV3 if GICv3 is supported
+config HAS_GICV3
+       bool
+
 endmenu
 
 source "common/Kconfig"

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 4ac5eddec43857ed8c954b8348cde8674e9251e3..2f050f57148b08331d7cec20a73552fc410475a1 100644 (file)
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -13,7 +13,7 @@ obj-y += sysctl.o
 obj-y += domain_build.o
 obj-y += gic.o gic-v2.o
 obj-$(CONFIG_ARM_32) += gic-hip04.o
-obj-$(HAS_GICV3) += gic-v3.o
+obj-$(CONFIG_HAS_GICV3) += gic-v3.o
 obj-y += io.o
 obj-y += irq.o
 obj-y += kernel.o

diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index 2158bd84a0bdb7b3fbae5960df16886bc583ff56..4947e64110603418d54e63428d9f5981e4f6115a 100644 (file)
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -32,8 +32,6 @@ ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
 CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE
 endif
 
-CFLAGS-$(HAS_GICV3) += -DHAS_GICV3
-
 EARLY_PRINTK := n
 
 ifeq ($(debug),y)

diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 531ce5d119ce79a4b4cd637324d6b2f7c529ee83..ee356837f1adfa0471a40d731a761e32f7c4a956 100644 (file)
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -103,7 +103,7 @@ int domain_vgic_init(struct domain *d, unsigned int nr_spis)
 
     switch ( d->arch.vgic.version )
     {
-#ifdef HAS_GICV3
+#ifdef CONFIG_HAS_GICV3
     case GIC_V3:
         if ( vgic_v3_init(d) )
            return -ENODEV;

diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index e7e40da89870e9cd51330a83729605f4bcaec051..aa7f28321cbe15d63f9ddc453039f3e515e84b5d 100644 (file)
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -102,7 +102,7 @@ struct arch_domain
         struct pending_irq *pending_irqs;
         /* Base address for guest GIC */
         paddr_t dbase; /* Distributor base address */
-#ifdef HAS_GICV3
+#ifdef CONFIG_HAS_GICV3
         /* GIC V3 addressing */
         /* List of contiguous occupied by the redistributors */
         struct vgic_rdist_region {

diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 630bb330dcf00660c32f6e604df28f2272668589..7bd06e18265254b46060504a25e8672735eaee84 100644 (file)
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -167,7 +167,7 @@
 
 #define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3")
 
-#ifdef HAS_GICV3
+#ifdef CONFIG_HAS_GICV3
 /*
  * GICv3 registers that needs to be saved/restored
  */
@@ -195,7 +195,7 @@ struct gic_v2 {
  */
 union gic_state_data {
     struct gic_v2 v2;
-#ifdef HAS_GICV3
+#ifdef CONFIG_HAS_GICV3
     struct gic_v3 v3;
 #endif
 };

diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 005f822d7dac5c51404bc29759b1f4dcad3fd559..a2fccc0fbc9a62bdd8fdeee9694e5b37bb5ec9d8 100644 (file)
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -336,7 +336,7 @@ extern void vgic_free_virq(struct domain *d, unsigned int virq);
 void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize,
                       paddr_t vbase, uint32_t aliased_offset);
 
-#ifdef HAS_GICV3
+#ifdef CONFIG_HAS_GICV3
 struct rdist_region;
 void vgic_v3_setup_hw(paddr_t dbase,
                       unsigned int nr_rdist_regions,