diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-11 11:17:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-11 11:17:57 -0700 |
| commit | 98f7fdced2e0efb1599a37b3e57671a7884f3a25 (patch) | |
| tree | 501dce52c88b9be3a8af92a5c8be9ae2ea8e6d8a /arch | |
| parent | 877029d9216dcc842f50d37571f318cd17a30a2d (diff) | |
| parent | 48400483565f0b7e633cbef94b139ff295b59de3 (diff) | |
| download | linux-stable-98f7fdced2e0efb1599a37b3e57671a7884f3a25.tar.gz linux-stable-98f7fdced2e0efb1599a37b3e57671a7884f3a25.tar.bz2 linux-stable-98f7fdced2e0efb1599a37b3e57671a7884f3a25.zip | |
Merge tag 'irq-urgent-2021-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"Two fixes:
- Fix a MIPS IRQ handling RCU bug
- Remove a DocBook annotation for a parameter that doesn't exist
anymore"
* tag 'irq-urgent-2021-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry
genirq/irqdesc: Drop excess kernel-doc entry @lookup
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/include/asm/irq.h | 3 | ||||
| -rw-r--r-- | arch/mips/kernel/irq.c | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index d1477ecb1af9..57561e0e6e8d 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -57,6 +57,9 @@ asmlinkage void plat_irq_dispatch(void); extern void do_IRQ(unsigned int irq); +struct irq_domain; +extern void do_domain_IRQ(struct irq_domain *domain, unsigned int irq); + extern void arch_init_irq(void); extern void spurious_interrupt(void); diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 85b6c60f285d..d20e002b3246 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -21,6 +21,7 @@ #include <linux/kallsyms.h> #include <linux/kgdb.h> #include <linux/ftrace.h> +#include <linux/irqdomain.h> #include <linux/atomic.h> #include <linux/uaccess.h> @@ -107,3 +108,18 @@ void __irq_entry do_IRQ(unsigned int irq) irq_exit(); } +#ifdef CONFIG_IRQ_DOMAIN +void __irq_entry do_domain_IRQ(struct irq_domain *domain, unsigned int hwirq) +{ + struct irq_desc *desc; + + irq_enter(); + check_stack_overflow(); + + desc = irq_resolve_mapping(domain, hwirq); + if (likely(desc)) + handle_irq_desc(desc); + + irq_exit(); +} +#endif |