提交 7ef71d75 编写于 作者: M Milton Miller 提交者: Benjamin Herrenschmidt

powerpc/cell: Use common smp ipi actions

The cell iic interrupt controller has enough software caused interrupts
to use a unique interrupt for each of the 4 messages powerpc uses.
This means each interrupt gets its own irq action/data combination.

Use the seperate, optimized, arch common ipi action functions
registered via the helper smp_request_message_ipi instead passing the
message as action data to a single action that then demultipexes to
the required acton via a switch statement.

smp_request_message_ipi will register the action as IRQF_PER_CPU
and IRQF_DISABLED, and WARN if the allocation fails for some reason,
so no need to print on that failure.  It will return positive if
the message will not be used by the kernel, in which case we can
free the virq.

In addition to elimiating inefficient code, this also corrects the
error that a kernel built with kexec but without a debugger would
not register the ipi for kdump to notify the other cpus of a crash.

This also restores the debugger action to be static to kernel/smp.c.
Signed-off-by: NMilton Miller <miltonm@bga.com>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 ce2a4045
...@@ -191,8 +191,6 @@ extern unsigned long __secondary_hold_spinloop; ...@@ -191,8 +191,6 @@ extern unsigned long __secondary_hold_spinloop;
extern unsigned long __secondary_hold_acknowledge; extern unsigned long __secondary_hold_acknowledge;
extern char __secondary_hold; extern char __secondary_hold;
extern irqreturn_t debug_ipi_action(int irq, void *data);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -129,7 +129,7 @@ static irqreturn_t call_function_single_action(int irq, void *data) ...@@ -129,7 +129,7 @@ static irqreturn_t call_function_single_action(int irq, void *data)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
irqreturn_t debug_ipi_action(int irq, void *data) static irqreturn_t debug_ipi_action(int irq, void *data)
{ {
if (crash_ipi_function_ptr) { if (crash_ipi_function_ptr) {
crash_ipi_function_ptr(get_irq_regs()); crash_ipi_function_ptr(get_irq_regs());
......
...@@ -192,50 +192,31 @@ struct irq_host *iic_get_irq_host(int node) ...@@ -192,50 +192,31 @@ struct irq_host *iic_get_irq_host(int node)
} }
EXPORT_SYMBOL_GPL(iic_get_irq_host); EXPORT_SYMBOL_GPL(iic_get_irq_host);
static irqreturn_t iic_ipi_action(int irq, void *dev_id) static void iic_request_ipi(int ipi)
{
int ipi = (int)(long)dev_id;
switch(ipi) {
case PPC_MSG_CALL_FUNCTION:
generic_smp_call_function_interrupt();
break;
case PPC_MSG_RESCHEDULE:
scheduler_ipi();
break;
case PPC_MSG_CALL_FUNC_SINGLE:
generic_smp_call_function_single_interrupt();
break;
case PPC_MSG_DEBUGGER_BREAK:
debug_ipi_action(0, NULL);
break;
}
return IRQ_HANDLED;
}
static void iic_request_ipi(int ipi, const char *name)
{ {
int virq; int virq;
virq = irq_create_mapping(iic_host, iic_ipi_to_irq(ipi)); virq = irq_create_mapping(iic_host, iic_ipi_to_irq(ipi));
if (virq == NO_IRQ) { if (virq == NO_IRQ) {
printk(KERN_ERR printk(KERN_ERR
"iic: failed to map IPI %s\n", name); "iic: failed to map IPI %s\n", smp_ipi_name[ipi]);
return; return;
} }
if (request_irq(virq, iic_ipi_action, IRQF_DISABLED, name,
(void *)(long)ipi)) /*
printk(KERN_ERR * If smp_request_message_ipi encounters an error it will notify
"iic: failed to request IPI %s\n", name); * the error. If a message is not needed it will return non-zero.
*/
if (smp_request_message_ipi(virq, ipi))
irq_dispose_mapping(virq);
} }
void iic_request_IPIs(void) void iic_request_IPIs(void)
{ {
iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call"); iic_request_ipi(PPC_MSG_CALL_FUNCTION);
iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched"); iic_request_ipi(PPC_MSG_RESCHEDULE);
iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE, "IPI-call-single"); iic_request_ipi(PPC_MSG_CALL_FUNC_SINGLE);
#ifdef CONFIG_DEBUGGER iic_request_ipi(PPC_MSG_DEBUGGER_BREAK);
iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
#endif /* CONFIG_DEBUGGER */
} }
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册