Skip to content

Commit a46bc5f

Browse files
lkundrakMarc Zyngier
authored andcommitted
irqchip/mmp: Add missing chained_irq_{enter,exit}()
The lack of chained_irq_exit() leaves the muxed interrupt masked on MMP3. For reasons unknown this is not a problem on MMP2. Signed-off-by: Lubomir Rintel <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent d6a9528 commit a46bc5f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/irqchip/irq-mmp.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/init.h>
1414
#include <linux/irq.h>
1515
#include <linux/irqchip.h>
16+
#include <linux/irqchip/chained_irq.h>
1617
#include <linux/irqdomain.h>
1718
#include <linux/io.h>
1819
#include <linux/ioport.h>
@@ -132,11 +133,14 @@ struct irq_chip icu_irq_chip = {
132133
static void icu_mux_irq_demux(struct irq_desc *desc)
133134
{
134135
unsigned int irq = irq_desc_get_irq(desc);
136+
struct irq_chip *chip = irq_desc_get_chip(desc);
135137
struct irq_domain *domain;
136138
struct icu_chip_data *data;
137139
int i;
138140
unsigned long mask, status, n;
139141

142+
chained_irq_enter(chip, desc);
143+
140144
for (i = 1; i < max_icu_nr; i++) {
141145
if (irq == icu_data[i].cascade_irq) {
142146
domain = icu_data[i].domain;
@@ -146,7 +150,7 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
146150
}
147151
if (i >= max_icu_nr) {
148152
pr_err("Spurious irq %d in MMP INTC\n", irq);
149-
return;
153+
goto out;
150154
}
151155

152156
mask = readl_relaxed(data->reg_mask);
@@ -158,6 +162,9 @@ static void icu_mux_irq_demux(struct irq_desc *desc)
158162
generic_handle_irq(icu_data[i].virq_base + n);
159163
}
160164
}
165+
166+
out:
167+
chained_irq_exit(chip, desc);
161168
}
162169

163170
static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq,

0 commit comments

Comments
 (0)