This patch provides an implementation of irq_set_nmi_routing by
allowing SPIs to be switched between group 1 (IRQ) and group 0 (FIQ).
It also repaces the interface used between the default FIQ handler and
the GIC. These extensions are required in order to allow SPIs to be
acknowledged and completed.
Signed-off-by: Daniel Thompson <daniel.thomp...@linaro.org>
---
arch/arm/kernel/traps.c | 12 ++++---
drivers/irqchip/irq-gic.c | 75 ++++++++++++++++++++++++++++++-----------
include/linux/irqchip/arm-gic.h | 8 ++++-
3 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 5645f81ac4cc..74c752b9db68 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -478,17 +478,21 @@ asmlinkage void __exception_irq_entry
handle_fiq_as_nmi(struct pt_regs *regs)
{
unsigned int cpu = smp_processor_id();
struct pt_regs *old_regs = set_irq_regs(regs);
+ int irq = 0;
__inc_irq_stat(cpu, __nmi_count);
nmi_enter();
+ irq = gic_ack_fiq();
-#ifdef CONFIG_ARM_GIC
- gic_handle_fiq_ipi();
-#endif
+ if (irq) {
+ /* empty - no SPI handlers (yet) */
+ } else {
#ifdef CONFIG_SMP
- ipi_cpu_backtrace(regs);
+ ipi_cpu_backtrace(regs);
#endif
+ }
+ gic_eoi_fiq();
nmi_exit();
set_irq_regs(old_regs);
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index c4f4a8827ed8..7c212b3126b8 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -129,6 +129,9 @@ struct irq_chip gic_arch_extn = {
static struct gic_chip_data gic_data[MAX_GIC_NR] __read_mostly;
+static int gic_set_group_irq(struct gic_chip_data *gic, unsigned int hwirq,
+ int group);
+
#ifdef CONFIG_GIC_NON_BANKED
static void __iomem *gic_get_percpu_base(union gic_base *base)
{
@@ -214,6 +217,18 @@ static void gic_eoi_irq(struct irq_data *d)
writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);
}
+static int gic_set_nmi_routing(struct irq_data *d, unsigned int nmi)
+{
+ struct gic_chip_data *gic = irq_data_get_irq_chip_data(d);
+ int ret;
+
+ ret = gic_set_group_irq(gic, gic_irq(d), !nmi);
+ if (ret >= 0)
+ ret = !ret;
+
+ return ret;
+}
+
static int gic_set_type(struct irq_data *d, unsigned int type)
{
void __iomem *base = gic_dist_base(d);
@@ -346,6 +361,7 @@ static struct irq_chip gic_chip = {
.irq_mask = gic_mask_irq,
.irq_unmask = gic_unmask_irq,
.irq_eoi = gic_eoi_irq,
+ .irq_set_nmi_routing = gic_set_nmi_routing,
.irq_set_type = gic_set_type,
.irq_retrigger = gic_retrigger,
#ifdef CONFIG_SMP
@@ -364,8 +380,8 @@ static struct irq_chip gic_chip = {
* If is safe to call this function on systems which do not support
* grouping (it will have no effect).
*/
-static void gic_set_group_irq(struct gic_chip_data *gic, unsigned int hwirq,
- int group)
+static int gic_set_group_irq(struct gic_chip_data *gic, unsigned int hwirq,
+ int group)
{
void __iomem *base = gic_data_dist_base(gic);
unsigned int grp_reg = hwirq / 32 * 4;
@@ -381,7 +397,7 @@ static void gic_set_group_irq(struct gic_chip_data *gic,
unsigned int hwirq,
* the EnableGrp1 bit set.
*/
if (!(GICD_ENABLE_GRP1 & readl_relaxed(base + GIC_DIST_CTRL)))
- return;
+ return -EINVAL;
raw_spin_lock(&irq_controller_lock);
@@ -403,32 +419,53 @@ static void gic_set_group_irq(struct gic_chip_data *gic,
unsigned int hwirq,
writel_relaxed(pri_val, base + GIC_DIST_PRI + pri_reg);
raw_spin_unlock(&irq_controller_lock);
+
+ return group;
}
-/*
- * Fully acknowledge (both ack and eoi) any outstanding FIQ-based IPI,
- * otherwise do nothing.
- */
-void gic_handle_fiq_ipi(void)
+static DEFINE_PER_CPU(unsigned long, gic_irqstat_fiq);
+
+int gic_ack_fiq(void)
{
struct gic_chip_data *gic = &gic_data[0];
void __iomem *cpu_base = gic_data_cpu_base(gic);
- unsigned long irqstat, irqnr;
+ unsigned long irqstat, hwirq;
+ unsigned int irq = 0;
+
+ /*
+ * This function is called unconditionally by the default FIQ
+ * handler so first we must check that the driver it
+ * initialized.
+ */
+ if (!gic->gic_irqs)
+ return 0;
if (WARN_ON(!in_nmi()))
- return;
+ return 0;
- while ((1u << readl_relaxed(cpu_base + GIC_CPU_HIGHPRI)) &
- SMP_IPI_FIQ_MASK) {
- irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK);
- writel_relaxed(irqstat, cpu_base + GIC_CPU_EOI);
+ /* read intack with the priority mask set so we only acknowledge FIQs */
+ writel_relaxed(GICC_INT_PRI_THRESHOLD >> 1, cpu_base + GIC_CPU_PRIMASK);
+ irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK);
+ raw_cpu_write(gic_irqstat_fiq, irqstat);
+ writel_relaxed(GICC_INT_PRI_THRESHOLD, cpu_base + GIC_CPU_PRIMASK);
- irqnr = irqstat & GICC_IAR_INT_ID_MASK;
- WARN_RATELIMIT(irqnr > 16,
- "Unexpected irqnr %lu (bad prioritization?)\n",
- irqnr);
- }
+ hwirq = irqstat & GICC_IAR_INT_ID_MASK;
+ if (likely(hwirq > 15 && hwirq < 1021))
+ irq = irq_find_mapping(gic->domain, hwirq);
+
+ return irq;
+}
+
+void gic_eoi_fiq(void)
+{
+ struct gic_chip_data *gic = &gic_data[0];
+
+ if (!gic->gic_irqs)
+ return;
+
+ writel_relaxed(raw_cpu_read(gic_irqstat_fiq),
+ gic_data_cpu_base(gic) + GIC_CPU_EOI);
}
void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 7690f70049a3..7c03e12f9e52 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -127,7 +127,13 @@ static inline void __init register_routable_domain_ops
gic_routable_irq_domain_ops = ops;
}
-void gic_handle_fiq_ipi(void);
+#ifdef CONFIG_ARM_GIC
+int gic_ack_fiq(void);
+void gic_eoi_fiq(void);
+#else
+static inline int gic_ack_fiq(void) { return 0; }
+static inline void gic_eof_fiq(void) {}
+#endif
#endif /* __ASSEMBLY */
#endif
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
