From: Stefano Stabellini <sstabellini@kernel.org>
To: julien.grall@arm.com
Cc: sstabellini@kernel.org, andrii_anisov@epam.com,
andrew.cooper3@citrix.com, George.Dunlap@citrix.com,
dfaggioli@suse.com, xen-devel@lists.xen.org
Subject: [PATCH v7 03/12] arm: rename HAS_GICV3 to GICV3
Date: Fri, 6 Jul 2018 16:13:54 -0700 [thread overview]
Message-ID: <1530918843-14318-3-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.10.1807061537300.13502@sstabellini-ThinkPad-X260>
HAS_GICV3 has become selectable by the user. To mark the change, rename
the option from HAS_GICV3 to GICV3.
Suggested-by: Julien Grall <julien.grall@arm.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Julien Grall <julien.grall@arm.com>
---
Changes in v3:
- no changes
Changes in v2:
- patch added
---
xen/arch/arm/Kconfig | 4 ++--
xen/arch/arm/Makefile | 4 ++--
xen/arch/arm/vgic.c | 2 +-
xen/arch/arm/vgic/vgic.c | 2 +-
xen/include/asm-arm/gic.h | 4 ++--
xen/include/asm-arm/vgic.h | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index fb69a66..66adce4 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -39,7 +39,7 @@ config ACPI
Advanced Configuration and Power Interface (ACPI) support for Xen is
an alternative to device tree on ARM64.
-config HAS_GICV3
+config GICV3
bool
prompt "GICv3 driver"
depends on ARM_64
@@ -52,7 +52,7 @@ config HAS_GICV3
config HAS_ITS
bool
prompt "GICv3 ITS MSI controller support" if EXPERT = "y"
- depends on HAS_GICV3 && !NEW_VGIC
+ depends on GICV3 && !NEW_VGIC
config NEW_VGIC
bool
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index a9533b1..b9c2fb7 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -17,7 +17,7 @@ obj-y += domctl.o
obj-$(EARLY_PRINTK) += early_printk.o
obj-y += gic.o
obj-y += gic-v2.o
-obj-$(CONFIG_HAS_GICV3) += gic-v3.o
+obj-$(CONFIG_GICV3) += gic-v3.o
obj-$(CONFIG_HAS_ITS) += gic-v3-its.o
obj-$(CONFIG_HAS_ITS) += gic-v3-lpi.o
obj-y += guestcopy.o
@@ -51,7 +51,7 @@ ifneq ($(CONFIG_NEW_VGIC),y)
obj-y += gic-vgic.o
obj-y += vgic.o
obj-y += vgic-v2.o
-obj-$(CONFIG_HAS_GICV3) += vgic-v3.o
+obj-$(CONFIG_GICV3) += vgic-v3.o
obj-$(CONFIG_HAS_ITS) += vgic-v3-its.o
endif
obj-y += vm_event.o
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 3fafdd0..7a2c455 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -98,7 +98,7 @@ int domain_vgic_register(struct domain *d, int *mmio_count)
{
switch ( d->arch.vgic.version )
{
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
case GIC_V3:
if ( vgic_v3_init(d, mmio_count) )
return -ENODEV;
diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c
index a35449b..832632a 100644
--- a/xen/arch/arm/vgic/vgic.c
+++ b/xen/arch/arm/vgic/vgic.c
@@ -974,7 +974,7 @@ unsigned int vgic_max_vcpus(const struct domain *d)
return min_t(unsigned int, MAX_VIRT_CPUS, vgic_vcpu_limit);
}
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
/* Dummy implementation to allow building without actual vGICv3 support. */
void vgic_v3_setup_hw(paddr_t dbase,
unsigned int nr_rdist_regions,
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 58b910f..22fa122 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -166,7 +166,7 @@
#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3")
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
/*
* GICv3 registers that needs to be saved/restored
*/
@@ -194,7 +194,7 @@ struct gic_v2 {
*/
union gic_state_data {
struct gic_v2 v2;
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
struct gic_v3 v3;
#endif
};
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 2a58ea3..374fdaa 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -156,7 +156,7 @@ struct vgic_dist {
struct pending_irq *pending_irqs;
/* Base address for guest GIC */
paddr_t dbase; /* Distributor base address */
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
/* GIC V3 addressing */
/* List of contiguous occupied by the redistributors */
struct vgic_rdist_region {
@@ -359,7 +359,7 @@ unsigned int vgic_max_vcpus(const struct domain *d);
void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize,
paddr_t vbase, uint32_t aliased_offset);
-#ifdef CONFIG_HAS_GICV3
+#ifdef CONFIG_GICV3
struct rdist_region;
void vgic_v3_setup_hw(paddr_t dbase,
unsigned int nr_rdist_regions,
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-07-06 23:13 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-06 23:12 [PATCH v7 00/12] arm: more kconfig configurability and small default configs Stefano Stabellini
2018-07-06 23:13 ` [PATCH v7 01/12] arm: remove the ARM HDLCD driver Stefano Stabellini
2018-07-06 23:13 ` [PATCH v7 02/12] arm: make it possible to disable HAS_GICV3 Stefano Stabellini
2018-07-06 23:13 ` Stefano Stabellini [this message]
2018-07-06 23:13 ` [PATCH v7 04/12] Make MEM_ACCESS configurable Stefano Stabellini
2018-07-06 23:13 ` [PATCH v7 05/12] make it possible to enable/disable UART drivers Stefano Stabellini
2018-07-06 23:13 ` [PATCH v7 06/12] arm: make it possible to disable the SMMU driver Stefano Stabellini
2018-07-06 23:13 ` [PATCH v7 07/12] arm: add a tiny kconfig configuration Stefano Stabellini
2018-07-23 11:17 ` Julien Grall
2018-07-06 23:13 ` [PATCH v7 08/12] arm: add ALL, QEMU, Rcar3 and MPSoC configs Stefano Stabellini
2018-07-23 11:24 ` Julien Grall
2018-07-24 22:08 ` Stefano Stabellini
2018-07-24 13:27 ` Andrii Anisov
2018-07-26 22:46 ` Stefano Stabellini
2018-07-27 10:30 ` Andrii Anisov
2018-07-27 11:20 ` Julien Grall
2018-07-27 11:21 ` Andrii Anisov
2018-07-27 11:27 ` Julien Grall
2018-07-27 11:34 ` Andrii Anisov
2018-07-27 11:39 ` Julien Grall
2018-07-27 17:11 ` Stefano Stabellini
2018-07-27 18:23 ` Andrii Anisov
2018-07-27 21:35 ` Stefano Stabellini
2018-07-27 22:09 ` Julien Grall
2018-07-27 23:30 ` Stefano Stabellini
2018-07-30 10:34 ` Julien Grall
2018-07-30 17:39 ` Stefano Stabellini
2018-07-30 16:11 ` Andrii Anisov
2018-07-06 23:14 ` [PATCH v7 09/12] xen: add per-platform defaults for NR_CPUS Stefano Stabellini
2018-07-23 11:26 ` Julien Grall
2018-07-06 23:14 ` [PATCH v7 10/12] xen: add cloc target Stefano Stabellini
2018-07-06 23:14 ` [PATCH v7 11/12] xen: specify support for EXPERT and DEBUG Kconfig options Stefano Stabellini
2018-07-16 12:50 ` Jan Beulich
2018-07-06 23:14 ` [PATCH v7 12/12] xen: clarify the security-support status of Kconfig options on ARM Stefano Stabellini
2018-07-23 11:37 ` Julien Grall
2018-07-24 22:31 ` Stefano Stabellini
2018-07-25 8:46 ` Julien Grall
2018-07-25 8:59 ` Andrew Cooper
2018-07-25 9:50 ` Julien Grall
2018-07-25 11:09 ` George Dunlap
2018-07-26 0:40 ` Stefano Stabellini
2018-07-25 9:11 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530918843-14318-3-git-send-email-sstabellini@kernel.org \
--to=sstabellini@kernel.org \
--cc=George.Dunlap@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=andrii_anisov@epam.com \
--cc=dfaggioli@suse.com \
--cc=julien.grall@arm.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.