lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/mpic: Use new smp_request_message_ipi

Browse Source 
MPIC has 4 ipis, so it can use the new smp_request_message_ipi to
reduce pathlength when receiving an ipi.

This has the side effect of using the common ipi names, and also
continuing to try request the remaining messages when one fails.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Milton Miller
2008-10-10 01:56:50 +00:00
committed by Paul Mackerras
parent 25ddd738c2
commit 78608dd32c
1 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/powerpc/sysdev/mpic.c
View File

@@ -661,17 +661,6 @@ static inline void mpic_eoi(struct mpic *mpic)
(void)mpic_cpu_read(MPIC_INFO(CPU_WHOAMI)); (void)mpic_cpu_read(MPIC_INFO(CPU_WHOAMI));
} }
#ifdef CONFIG_SMP
static irqreturn_t mpic_ipi_action(int irq, void *data)
{
long ipi = (long)data;
smp_message_recv(ipi);
return IRQ_HANDLED;
}
#endif /* CONFIG_SMP */
/* /*
* Linux descriptor level callbacks * Linux descriptor level callbacks
*/ */
@@ -1543,13 +1532,7 @@ unsigned int mpic_get_mcirq(void)
void mpic_request_ipis(void) void mpic_request_ipis(void)
{ {
struct mpic *mpic = mpic_primary; struct mpic *mpic = mpic_primary;
long i, err; int i;
static char *ipi_names[] = {
"IPI0 (call function)",
"IPI1 (reschedule)",
"IPI2 (call function single)",
"IPI3 (debugger break)",
};
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
printk(KERN_INFO "mpic: requesting IPIs ... \n"); printk(KERN_INFO "mpic: requesting IPIs ... \n");
@@ -1558,17 +1541,10 @@ void mpic_request_ipis(void)
unsigned int vipi = irq_create_mapping(mpic->irqhost, unsigned int vipi = irq_create_mapping(mpic->irqhost,
mpic->ipi_vecs[0] + i); mpic->ipi_vecs[0] + i);
if (vipi == NO_IRQ) { if (vipi == NO_IRQ) {
printk(KERN_ERR "Failed to map IPI %ld\n", i); printk(KERN_ERR "Failed to map %s\n", smp_ipi_name[i]);
break; continue;
}
err = request_irq(vipi, mpic_ipi_action,
IRQF_DISABLED|IRQF_PERCPU,
ipi_names[i], (void *)i);
if (err) {
printk(KERN_ERR "Request of irq %d for IPI %ld failed\n",
vipi, i);
break;
} }
smp_request_message_ipi(vipi, i);
} }
} }