irq: riscv: perform irqentry in entry code

In preparation for removing HANDLE_DOMAIN_IRQ_IRQENTRY, have arch/riscv perform all the irqentry accounting in its entry code. As arch/riscv uses GENERIC_IRQ_MULTI_HANDLER, we can use generic_handle_arch_irq() to do so. Since generic_handle_arch_irq() handles the irq entry and setting the irq regs, and happens before the irqchip code calls handle_IPI(), we can remove the redundant irq entry and irq regs manipulation from handle_IPI(). There should be no functional change as a result of this patch.

Mark Rutland committed 5 years ago

Commit 7ecbc641 parent 418360b3 files · +2 −11Browse files

Unified · Split

3 files

arch/riscv/Kconfig +0 −1
arch/riscv/kernel/entry.S +1 −2
arch/riscv/kernel/smp.c +1 −8

arch/riscv/Kconfig+0−1

@@ -63,7 +63,6 @@ config RISCV · 62 unmodified lines
63	select GENERIC_SMP_IDLE_THREAD	63	select GENERIC_SMP_IDLE_THREAD
64	select GENERIC_TIME_VSYSCALL if MMU && 64BIT	64	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
65	select HANDLE_DOMAIN_IRQ	65	select HANDLE_DOMAIN_IRQ
66	select HANDLE_DOMAIN_IRQ_IRQENTRY
67	select HAVE_ARCH_AUDITSYSCALL	66	select HAVE_ARCH_AUDITSYSCALL
68	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL	67	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
69	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL	68	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL

arch/riscv/kernel/entry.S+1−2

@@ -130,8 +130,7 @@ skip_context_tracking: · 129 unmodified lines
130		130
131	/* Handle interrupts */	131	/* Handle interrupts */
132	move a0, sp /* pt_regs */	132	move a0, sp /* pt_regs */
133	la a1, handle_arch_irq	133	la a1, generic_handle_arch_irq
134	REG_L a1, (a1)
135	jr a1	134	jr a1
136	1:	135	1:
137	/*	136	/*

arch/riscv/kernel/smp.c+1−8

 void handle_IPI(struct pt_regs *regs)
 {
-	struct pt_regs *old_regs = set_irq_regs(regs);
 	unsigned long *pending_ipis = &ipi_data[smp_processor_id()].bits;
 	unsigned long *stats = ipi_data[smp_processor_id()].stats;
-	irq_enter();
 	riscv_clear_ipi();
 	while (true) {
 		ops = xchg(pending_ipis, 0);
 		if (ops == 0)
-			goto done;
+			return;
 		if (ops & (1 << IPI_RESCHEDULE)) {
 			stats[IPI_RESCHEDULE]++;
 		/* Order data access and bit testing. */
 		mb();
 	}
-done:
-	irq_exit();
-	set_irq_regs(old_regs);
 }
 static const char * const ipi_names[] = {