irq fixes for 3.17
Linus,
please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus
Another pile of ARM specific irq chip fixlets:
- Off by one bugs in the crossbar driver
- Missing annotations
- A bunch of "make it compile" updates
I pulled the lot today from Jason, but it has been in -next for at least a week.
Thanks,
tglx
------------------>
Dan Carpenter (1):
irqchip: crossbar: Off by one bugs in init
Mark Brown (2):
irqchip: gic-v3: Only define gic_peek_irq() when building SMP
irqchip: gic-v3: Tag all low level accessors __maybe_unused
Naveen Krishna Chatradhi (1):
irqchip: exynos-combiner: Fix compilation error on ARM64
Will Deacon (2):
irqchip: gic: Make gic_default_routable_irq_domain_ops static
irqchip: gic-v3: Declare rdist as __percpu pointer to __iomem pointer
drivers/irqchip/exynos-combiner.c | 1 + drivers/irqchip/irq-crossbar.c | 4 ++-- drivers/irqchip/irq-gic-v3.c | 38 +++++++++++++++++++------------------- drivers/irqchip/irq-gic.c | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-)
drivers/irqchip/exynos-combiner.c +1 -0
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> +#include <linux/interrupt.h> #include <linux/of_address.h> #include <linux/of_irq.h>
drivers/irqchip/irq-crossbar.c +2 -2
@@ -220,7 +220,7 @@ static int __init crossbar_of_init(struct device_node *node)of_property_read_u32_index (node,"ti,irqs-reserved" , i, &entry); -if (entry > max) { +if (entry >= max) {pr_err ("Invalid reserved entry\n" ); ret = -EINVAL ; goto err_irq_map;
@@ -238,7 +238,7 @@ static int __init crossbar_of_init(struct device_node *node)of_property_read_u32_index (node,"ti,irqs-skip" , i, &entry); -if (entry > max) { +if (entry >= max) {pr_err ("Invalid skip entry\n" ); ret = -EINVAL ; goto err_irq_map;
drivers/irqchip/irq-gic-v3.c +19 -19
@@ -36,7 +36,7 @@struct gic_chip_data {void __iomem *dist_base;void __iomem **redist_base; -void __percpu __iomem **rdist; +void __iomem *__percpu *rdist;struct irq_domain *domain;u64 redist_stride;u32 redist_regions;
@@ -104,7 +104,7 @@ static void gic_redist_wait_for_rwp(void) }/* Low level accessors */ -static u64 gic_read_iar (void ) +static u64 __maybe_unused gic_read_iar (void ) {u64 irqstat;
@@ -112,24 +112,24 @@ static u64 gic_read_iar(void)return irqstat; } -static void gic_write_pmr (u64 val) +static void __maybe_unused gic_write_pmr (u64 val) { asm volatile("msr_s " __stringify(ICC_PMR_EL1) ", %0" : : "r" (val)); } -static void gic_write_ctlr (u64 val) +static void __maybe_unused gic_write_ctlr (u64 val) { asm volatile("msr_s " __stringify(ICC_CTLR_EL1) ", %0" : : "r" (val));isb (); } -static void gic_write_grpen1 (u64 val) +static void __maybe_unused gic_write_grpen1 (u64 val) { asm volatile("msr_s " __stringify(ICC_GRPEN1_EL1) ", %0" : : "r" (val));isb (); } -static void gic_write_sgi1r (u64 val) +static void __maybe_unused gic_write_sgi1r (u64 val) { asm volatile("msr_s " __stringify(ICC_SGI1R_EL1) ", %0" : : "r" (val)); }
@@ -200,19 +200,6 @@ static void gic_poke_irq(struct irq_data *d, u32 offset)rwp_wait (); } -static int gic_peek_irq (struct irq_data *d,u32 offset) -{ -u32 mask =1 << (gic_irq (d) %32 ); -void __iomem *base; - -if (gic_irq_in_rdist (d)) - base =gic_data_rdist_sgi_base (); -else - base = gic_data.dist_base; - -return !!(readl_relaxed (base + offset + (gic_irq (d) /32 ) *4 ) & mask); -} -static void gic_mask_irq (struct irq_data *d) {gic_poke_irq (d,GICD_ICENABLER );
@@ -401,6 +388,19 @@ static void gic_cpu_init(void) }#ifdef CONFIG_SMP +static int gic_peek_irq (struct irq_data *d,u32 offset) +{ +u32 mask =1 << (gic_irq (d) %32 ); +void __iomem *base; + +if (gic_irq_in_rdist (d)) + base =gic_data_rdist_sgi_base (); +else + base = gic_data.dist_base; + +return !!(readl_relaxed (base + offset + (gic_irq (d) /32 ) *4 ) & mask); +} +static int gic_secondary_init (struct notifier_block *nfb,unsigned long action,void *hcpu) {
drivers/irqchip/irq-gic.c +1 -1
@@ -867,7 +867,7 @@ static int gic_routable_irq_domain_xlate(struct irq_domain *d,return 0 ; } -const struct irq_domain_ops gic_default_routable_irq_domain_ops = { +static const struct irq_domain_ops gic_default_routable_irq_domain_ops = { .map = gic_routable_irq_domain_map, .unmap = gic_routable_irq_domain_unmap, .xlate = gic_routable_irq_domain_xlate,