Messages in this thread Patch in this message | | | Date | Tue, 26 Oct 2021 10:15:59 -0000 | From | "irqchip-bot for Mark Rutland" <> | Subject | [irqchip: irq/irqchip-next] irq: csky: perform irqentry in entry code |
| |
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 287232987f0ebb29f68cfab13625017bbfb38adc Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/287232987f0ebb29f68cfab13625017bbfb38adc Author: Mark Rutland <mark.rutland@arm.com> AuthorDate: Wed, 20 Oct 2021 11:00:46 +01:00 Committer: Mark Rutland <mark.rutland@arm.com> CommitterDate: Tue, 26 Oct 2021 10:13:27 +01:00
irq: csky: perform irqentry in entry code
In preparation for removing HANDLE_DOMAIN_IRQ_IRQENTRY, have arch/csky perform all the irqentry accounting in its entry code. As arch/csky uses GENERIC_IRQ_MULTI_HANDLER, we can use generic_handle_arch_irq() to do so.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Guo Ren <guoren@kernel.org> Reviewed-by: Marc Zyngier <maz@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> --- arch/csky/Kconfig | 1 - arch/csky/kernel/entry.S | 2 +- arch/csky/kernel/irq.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 45f03f6..9d4d898 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -18,7 +18,6 @@ config CSKY select DMA_DIRECT_REMAP select IRQ_DOMAIN select HANDLE_DOMAIN_IRQ - select HANDLE_DOMAIN_IRQ_IRQENTRY select DW_APB_TIMER_OF select GENERIC_IOREMAP select GENERIC_LIB_ASHLDI3 diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S index 00e3c8e..a4ababf 100644 --- a/arch/csky/kernel/entry.S +++ b/arch/csky/kernel/entry.S @@ -249,7 +249,7 @@ ENTRY(csky_irq) mov a0, sp - jbsr csky_do_IRQ + jbsr generic_handle_arch_irq jmpi ret_from_exception diff --git a/arch/csky/kernel/irq.c b/arch/csky/kernel/irq.c index 03a1930..fcdaf31 100644 --- a/arch/csky/kernel/irq.c +++ b/arch/csky/kernel/irq.c @@ -15,8 +15,3 @@ void __init init_IRQ(void) setup_smp_ipi(); #endif } - -asmlinkage void __irq_entry csky_do_IRQ(struct pt_regs *regs) -{ - handle_arch_irq(regs); -}
| |