powerpc: Remove checks for MSG_ALL and MSG_ALL_BUT_SELF

Now that smp_ops->smp_message_pass is always called with an (online) cpu
number for the target remove the checks for MSG_ALL and MSG_ALL_BUT_SELF.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

12 files changed, 21 insertions, 163 deletions

diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index 0893ab9343a6..3269eb49640a 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -27,7 +27,7 @@ enum ppc_dbell {
         PPC_G_DBELL_MC = 4,     /* guest mcheck doorbell */
 };
 
-extern void doorbell_message_pass(int target, int msg);
+extern void doorbell_message_pass(int cpu, int msg);
 extern void doorbell_exception(struct pt_regs *regs);
 extern void doorbell_check_self(void);
 extern void doorbell_setup_this_cpu(void);
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index c6345acf166f..b0802a5bd744 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -31,7 +31,7 @@ struct kimage;
 
 #ifdef CONFIG_SMP
 struct smp_ops_t {
-        void  (*message_pass)(int target, int msg);
+        void  (*message_pass)(int cpu, int msg);
         int   (*probe)(void);
         int   (*kick_cpu)(int nr);
         void  (*setup_cpu)(int nr);
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index 6c06306c4100..1750c8dae1fa 100644
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -40,7 +40,7 @@ struct icp_ops {
         void (*teardown_cpu)(void);
         void (*flush_ipi)(void);
 #ifdef CONFIG_SMP
-        void (*message_pass)(int target, int msg);
+        void (*message_pass)(int cpu, int msg);
         irq_handler_t ipi_action;
 #endif
 };
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index 3307a52d797f..e49b24c84133 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -34,32 +34,13 @@ void doorbell_setup_this_cpu(void)
         info->tag = mfspr(SPRN_PIR) & 0x3fff;
 }
 
-void doorbell_message_pass(int target, int msg)
+void doorbell_message_pass(int cpu, int msg)
 {
         struct doorbell_cpu_info *info;
-        int i;
-
-        if (target < NR_CPUS) {
-                info = &per_cpu(doorbell_cpu_info, target);
-                set_bit(msg, &info->messages);
-                ppc_msgsnd(PPC_DBELL, 0, info->tag);
-        }
-        else if (target == MSG_ALL_BUT_SELF) {
-                for_each_online_cpu(i) {
-                        if (i == smp_processor_id())
-                                continue;
-                        info = &per_cpu(doorbell_cpu_info, i);
-                        set_bit(msg, &info->messages);
-                        ppc_msgsnd(PPC_DBELL, 0, info->tag);
-                }
-        }
-        else { /* target == MSG_ALL */
-                for_each_online_cpu(i) {
-                        info = &per_cpu(doorbell_cpu_info, i);
-                        set_bit(msg, &info->messages);
-                }
-                ppc_msgsnd(PPC_DBELL, PPC_DBELL_MSG_BRDCAST, 0);
-        }
+
+        info = &per_cpu(doorbell_cpu_info, cpu);
+        set_bit(msg, &info->messages);
+        ppc_msgsnd(PPC_DBELL, 0, info->tag);
 }
 
 void doorbell_exception(struct pt_regs *regs)
diff --git a/arch/powerpc/platforms/cell/beat_smp.c b/arch/powerpc/platforms/cell/beat_smp.c
index 3e86acbb0fb4..23bbe6e08c87 100644
--- a/arch/powerpc/platforms/cell/beat_smp.c
+++ b/arch/powerpc/platforms/cell/beat_smp.c
@@ -67,22 +67,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         return 0;
 }
 
-static void smp_beatic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                beatic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        beatic_cause_IPI(i, msg);
-                }
-        }
-}
-
 static int __init smp_beatic_probe(void)
 {
         return cpumask_weight(cpu_possible_mask);
@@ -105,7 +89,7 @@ static int smp_celleb_cpu_bootable(unsigned int nr)
         return 1;
 }
 static struct smp_ops_t bpa_beatic_smp_ops = {
-        .message_pass   = smp_beatic_message_pass,
+        .message_pass   = beatic_cause_IPI,
         .probe          = smp_beatic_probe,
         .kick_cpu       = smp_celleb_kick_cpu,
         .setup_cpu      = smp_beatic_setup_cpu,
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index a2161b91b0bf..d176e6148e3f 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -103,22 +103,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         return 1;
 }
 
-static void smp_iic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                iic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        iic_cause_IPI(i, msg);
-                }
-        }
-}
-
 static int __init smp_iic_probe(void)
 {
         iic_request_IPIs();
@@ -168,7 +152,7 @@ static int smp_cell_cpu_bootable(unsigned int nr)
         return 1;
 }
 static struct smp_ops_t bpa_iic_smp_ops = {
-        .message_pass   = smp_iic_message_pass,
+        .message_pass   = iic_cause_IPI,
         .probe          = smp_iic_probe,
         .kick_cpu       = smp_cell_kick_cpu,
         .setup_cpu      = smp_cell_setup_cpu,
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index 02a677a1f912..dcdbc5dc5aad 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -59,28 +59,12 @@ void iSeries_smp_message_recv(void)
                         smp_message_recv(msg);
 }
 
-static inline void smp_iSeries_do_message(int cpu, int msg)
+static void smp_iSeries_message_pass(int cpu, int msg)
 {
         set_bit(msg, &iSeries_smp_message[cpu]);
         HvCall_sendIPI(&(paca[cpu]));