Patchwork [14/16] powerpc mpic: use smp_request_message_ipi

login
register
mail settings
Submitter Milton Miller
Date Oct. 10, 2008, 11:56 a.m.
Message ID <patch-ipi-3@bga.com>
Download mbox | patch
Permalink /patch/3775/
State Accepted, archived
Commit 78608dd32ce46789e970d6c3c423cd668c138d6c
Delegated to: Paul Mackerras
Headers show

Comments

Milton Miller - Oct. 10, 2008, 11:56 a.m.
mpic has 4 ipis so use the new smp_request_message_ipi to reduce
pathlength when reciving 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>

Patch

Index: next.git/arch/powerpc/sysdev/mpic.c
===================================================================
--- next.git.orig/arch/powerpc/sysdev/mpic.c	2008-10-05 00:20:41.000000000 -0500
+++ next.git/arch/powerpc/sysdev/mpic.c	2008-10-05 00:21:41.000000000 -0500
@@ -616,17 +616,6 @@  static inline void mpic_eoi(struct mpic 
 	(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
  */
@@ -1492,13 +1481,7 @@  unsigned int mpic_get_mcirq(void)
 void mpic_request_ipis(void)
 {
 	struct mpic *mpic = mpic_primary;
-	long i, err;
-	static char *ipi_names[] = {
-		"IPI0 (call function)",
-		"IPI1 (reschedule)",
-		"IPI2 (call function single)",
-		"IPI3 (debugger break)",
-	};
+	int i;
 	BUG_ON(mpic == NULL);
 
 	printk(KERN_INFO "mpic: requesting IPIs ... \n");
@@ -1507,17 +1490,10 @@  void mpic_request_ipis(void)
 		unsigned int vipi = irq_create_mapping(mpic->irqhost,
 						       mpic->ipi_vecs[0] + i);
 		if (vipi == NO_IRQ) {
-			printk(KERN_ERR "Failed to map IPI %ld\n", i);
-			break;
-		}
-		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;
+			printk(KERN_ERR "Failed to map %s\n", smp_ipi_name[i]);
+			continue;
 		}
+		smp_request_message_ipi(vipi, i);
 	}
 }