1 files changed, 44 insertions, 44 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 63b73f3d4c9f..cc87025e8f54 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -701,8 +701,7 @@ ia64_mca_cmc_vector_enable_keventd(struct work_struct *unused)
 /*
  * ia64_mca_wakeup
  *
- *      Send an inter-cpu interrupt to wake-up a particular cpu
- *      and mark that cpu to be out of rendez.
+ *      Send an inter-cpu interrupt to wake-up a particular cpu.
  *
  *  Inputs  :   cpuid
  *  Outputs :   None
@@ -711,14 +710,12 @@ static void
 ia64_mca_wakeup(int cpu)
 {
         platform_send_ipi(cpu, IA64_MCA_WAKEUP_VECTOR, IA64_IPI_DM_INT, 0);
-        ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
-
 }
 
 /*
  * ia64_mca_wakeup_all
  *
- *      Wakeup all the cpus which have rendez'ed previously.
+ *      Wakeup all the slave cpus which have rendez'ed previously.
  *
  *  Inputs  :   None
  *  Outputs :   None
@@ -741,7 +738,10 @@ ia64_mca_wakeup_all(void)
  *
  *      This is handler used to put slave processors into spinloop
  *      while the monarch processor does the mca handling and later
- *      wake each slave up once the monarch is done.
+ *      wake each slave up once the monarch is done.  The state
+ *      IA64_MCA_RENDEZ_CHECKIN_DONE indicates the cpu is rendez'ed
+ *      in SAL.  The state IA64_MCA_RENDEZ_CHECKIN_NOTDONE indicates
+ *      the cpu has come out of OS rendezvous.
  *
  *  Inputs  :   None
  *  Outputs :   None
@@ -778,6 +778,7 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg)
                        (long)&nd, 0, 0) == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
 
+        ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
         /* Enable all interrupts */
         local_irq_restore(flags);
         return IRQ_HANDLED;
@@ -1135,30 +1136,27 @@ no_mod:
 static void
 ia64_wait_for_slaves(int monarch, const char *type)
 {
-        int c, wait = 0, missing = 0;
-        for_each_online_cpu(c) {
-                if (c == monarch)
-                        continue;
-                if (ia64_mc_info.imi_rendez_checkin[c] == IA64_MCA_RENDEZ_CHECKIN_NOTDONE) {
-                        udelay(1000);           /* short wait first */
-                        wait = 1;
-                        break;
-                }
-        }
-        if (!wait)
-                goto all_in;
-        for_each_online_cpu(c) {
-                if (c == monarch)
-                        continue;
-                if (ia64_mc_info.imi_rendez_checkin[c] == IA64_MCA_RENDEZ_CHECKIN_NOTDONE) {
-                        udelay(5*1000000);      /* wait 5 seconds for slaves (arbitrary) */
-                        if (ia64_mc_info.imi_rendez_checkin[c] == IA64_MCA_RENDEZ_CHECKIN_NOTDONE)
-                                missing = 1;
-                        break;
+        int c, i , wait;
+
+        /*
+         * wait 5 seconds total for slaves (arbitrary)
+         */
+        for (i = 0; i < 5000; i++) {
+                wait = 0;
+                for_each_online_cpu(c) {
+                        if (c == monarch)
+                                continue;
+                        if (ia64_mc_info.imi_rendez_checkin[c]
+                                        == IA64_MCA_RENDEZ_CHECKIN_NOTDONE) {
+                                udelay(1000);           /* short wait */
+                                wait = 1;
+                                break;
+                        }
                 }
+                if (!wait)
+                        goto all_in;
         }
-        if (!missing)
-                goto all_in;
+
         /*
          * Maybe slave(s) dead. Print buffered messages immediately.
          */
@@ -1224,26 +1222,27 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
         if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, (long)&nd, 0, 0)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__FUNCTION__);
+
+        ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
         if (sos->monarch) {
                 ia64_wait_for_slaves(cpu, "MCA");
+
+                /* Wakeup all the processors which are spinning in the
+                 * rendezvous loop.  They will leave SAL, then spin in the OS
+                 * with interrupts disabled until this monarch cpu leaves the
+                 * MCA handler.  That gets control back to the OS so we can
+                 * backtrace the other cpus, backtrace when spinning in SAL
+                 * does not work.
+                 */
+                ia64_mca_wakeup_all();
+                if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
+                                == NOTIFY_STOP)
+                        ia64_mca_spin(__FUNCTION__);
         } else {
-                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
                 while (cpu_isset(cpu, mca_cpu))
                         cpu_relax();    /* spin until monarch wakes us */
-                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
         }
 
-        /* Wakeup all the processors which are spinning in the rendezvous loop.
-         * They will leave SAL, then spin in the OS with interrupts disabled
-         * until this monarch cpu leaves the MCA handler.  That gets control
-         * back to the OS so we can backtrace the other cpus, backtrace when
-         * spinning in SAL does not work.
-         */
-        ia64_mca_wakeup_all();
-        if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
-                        == NOTIFY_STOP)
-                ia64_mca_spin(__FUNCTION__);
-
         /* Get the MCA error record and log it */
         ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
 
@@ -1277,21 +1276,22 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
                 /* wake up the next monarch cpu,
                  * and put this cpu in the rendez loop.
                  */
-                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
                 for_each_online_cpu(i) {
                         if (cpu_isset(i, mca_cpu)) {
                                 monarch_cpu = i;
                                 cpu_clear(i, mca_cpu);  /* wake next cpu */
                                 while (monarch_cpu != -1)
                                         cpu_relax();    /* spin until last cpu leaves */
-                                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
                                 set_curr_task(cpu, previous_current);
+                                ia64_mc_info.imi_rendez_checkin[cpu]
+                                                = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
                                 return;
                         }
                 }
         }
         set_curr_task(cpu, previous_current);
-        monarch_cpu = -1;
+        ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
+        monarch_cpu = -1;       /* This frees the slaves and previous monarchs */
 }
 
 static DECLARE_WORK(cmc_disable_work, ia64_mca_cmc_vector_disable_keventd);