diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-03-30 11:43:59 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-04-01 10:12:24 +0200 |
| commit | 4cea749d56bec9409f3bd126d2b2f949dc6c66e2 (patch) | |
| tree | 0828f56c2e90ff58a111121a34ec200686304dea /drivers/irqchip/irq-xilinx-intc.c | |
| parent | Revert "irqchip/xilinx: Do not call irq_set_default_host()" (diff) | |
| download | linux-4cea749d56bec9409f3bd126d2b2f949dc6c66e2.tar.xz linux-4cea749d56bec9409f3bd126d2b2f949dc6c66e2.zip | |
Revert "irqchip/xilinx: Enable generic irq multi handler"
This reverts commit a0789993bf8266e62fea6b4613945ba081c71e7d, which
breaks a number of PPC platforms.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/44b64be7-9240-fd52-af90-e0245220f38b@xilinx.com
Diffstat (limited to 'drivers/irqchip/irq-xilinx-intc.c')
| -rw-r--r-- | drivers/irqchip/irq-xilinx-intc.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c index ea741818a1ce..1d3d273309bd 100644 --- a/drivers/irqchip/irq-xilinx-intc.c +++ b/drivers/irqchip/irq-xilinx-intc.c @@ -124,6 +124,20 @@ static unsigned int xintc_get_irq_local(struct xintc_irq_chip *irqc) return irq; } +unsigned int xintc_get_irq(void) +{ + unsigned int irq = -1; + u32 hwirq; + + hwirq = xintc_read(primary_intc, IVR); + if (hwirq != -1U) + irq = irq_find_mapping(primary_intc->root_domain, hwirq); + + pr_debug("irq-xilinx: hwirq=%d, irq=%d\n", hwirq, irq); + + return irq; +} + static int xintc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { struct xintc_irq_chip *irqc = d->host_data; @@ -163,25 +177,6 @@ static void xil_intc_irq_handler(struct irq_desc *desc) chained_irq_exit(chip, desc); } -static void xil_intc_handle_irq(struct pt_regs *regs) -{ - u32 hwirq; - struct xintc_irq_chip *irqc = primary_intc; - - do { - hwirq = xintc_read(irqc, IVR); - if (likely(hwirq != -1U)) { - int ret; - - ret = handle_domain_irq(irqc->root_domain, hwirq, regs); - WARN_ONCE(ret, "Unhandled HWIRQ %d\n", hwirq); - continue; - } - - break; - } while (1); -} - static int __init xilinx_intc_of_init(struct device_node *intc, struct device_node *parent) { @@ -251,7 +246,6 @@ static int __init xilinx_intc_of_init(struct device_node *intc, } else { primary_intc = irqc; irq_set_default_host(primary_intc->root_domain); - set_handle_irq(xil_intc_handle_irq); } return 0; |