Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89d798b7 authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King
Browse files

ARM: 8487/1: Remove IPI_CALL_FUNC_SINGLE 



Since 9a46ad6d ("smp: make smp_call_function_many() use logic
similar to smp_call_function_single()"), the core IPI handling
has been simplified, and generic_smp_call_function_interrupt is
now the same as generic_smp_call_function_single_interrupt.

This means that one of IPI_CALL_FUNC and IPI_CALL_FUNC_SINGLE has
become redundant. We can then safely drop IPI_CALL_FUNC_SINGLE,
and use only IPI_CALL_FUNC.

This has the advantage of reducing the number of SGI IDs we're using
(a fairly scarse resource).

Tested on a dual A7 board.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f6419f24

arch/arm/include/asm/hardirq.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/threads.h>

#include <asm/irq.h>



#define NR_IPI	8

#define NR_IPI	7



typedef struct {

	unsigned int __softirq_pending;

arch/arm/kernel/smp.c

+1 −9
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ enum ipi_msg_type { 
	IPI_TIMER,

	IPI_RESCHEDULE,

	IPI_CALL_FUNC,

	IPI_CALL_FUNC_SINGLE,

	IPI_CPU_STOP,

	IPI_IRQ_WORK,

	IPI_COMPLETION,
@@ -475,7 +474,6 @@ static const char *ipi_types[NR_IPI] __tracepoint_string = { 
	S(IPI_TIMER, "Timer broadcast interrupts"),

	S(IPI_RESCHEDULE, "Rescheduling interrupts"),

	S(IPI_CALL_FUNC, "Function call interrupts"),

	S(IPI_CALL_FUNC_SINGLE, "Single function call interrupts"),

	S(IPI_CPU_STOP, "CPU stop interrupts"),

	S(IPI_IRQ_WORK, "IRQ work interrupts"),

	S(IPI_COMPLETION, "completion interrupts"),
@@ -525,7 +523,7 @@ void arch_send_wakeup_ipi_mask(const struct cpumask *mask) 


void arch_send_call_function_single_ipi(int cpu)

{

	smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);

	smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC);

}



#ifdef CONFIG_IRQ_WORK
@@ -620,12 +618,6 @@ void handle_IPI(int ipinr, struct pt_regs *regs) 
		irq_exit();

		break;



	case IPI_CALL_FUNC_SINGLE:

		irq_enter();

		generic_smp_call_function_single_interrupt();

		irq_exit();

		break;



	case IPI_CPU_STOP:

		irq_enter();

		ipi_cpu_stop(cpu);