aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2015-03-11 11:45:34 -0400
committerJason Cooper <jason@lakedaemon.net>2015-03-14 21:27:42 -0400
commit49869be2d9d0e9195706da7050c81bc909f41f4f (patch)
treea87135da508921fb058ebb6173cc2c4b809268c5
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
irqchip: gic: Add an entry point to set up irqchip flags
A common use of gic_arch_extn is to set up additional flags to the GIC irqchip. It looks like a benign enough hack that doesn't really require the users of that feature to be converted to stacked domains. Add a gic_set_irqchip_flags() function that platform code can call instead of using the dreaded gic_arch_extn. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Link: https://lkml.kernel.org/r/1426088737-15817-2-git-send-email-marc.zyngier@arm.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--drivers/irqchip/irq-gic.c5
-rw-r--r--include/linux/irqchip/arm-gic.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 4634cf7d0ec3..072432c22207 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -922,6 +922,11 @@ static const struct irq_domain_ops gic_default_routable_irq_domain_ops = {
922const struct irq_domain_ops *gic_routable_irq_domain_ops = 922const struct irq_domain_ops *gic_routable_irq_domain_ops =
923 &gic_default_routable_irq_domain_ops; 923 &gic_default_routable_irq_domain_ops;
924 924
925void gic_set_irqchip_flags(unsigned long flags)
926{
927 gic_chip.flags |= flags;
928}
929
925void __init gic_init_bases(unsigned int gic_nr, int irq_start, 930void __init gic_init_bases(unsigned int gic_nr, int irq_start,
926 void __iomem *dist_base, void __iomem *cpu_base, 931 void __iomem *dist_base, void __iomem *cpu_base,
927 u32 percpu_offset, struct device_node *node) 932 u32 percpu_offset, struct device_node *node)
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 71d706d5f169..3bca864fd6fc 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -97,6 +97,7 @@ struct device_node;
97 97
98extern struct irq_chip gic_arch_extn; 98extern struct irq_chip gic_arch_extn;
99 99
100void gic_set_irqchip_flags(unsigned long flags);
100void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, 101void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
101 u32 offset, struct device_node *); 102 u32 offset, struct device_node *);
102void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); 103void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);