1 files changed, 54 insertions, 6 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 6c18221dba36..e51bced3b0fa 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -69,6 +69,7 @@
  * 2007-04-27 Russ Anderson <rja@sgi.com>
  *            Support multiple cpus going through OS_MCA in the same event.
  */
+#include <linux/jiffies.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -97,6 +98,7 @@
 
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
+#include <asm/tlb.h>
 
 #include "mca_drv.h"
 #include "entry.h"
@@ -112,6 +114,7 @@ DEFINE_PER_CPU(u64, ia64_mca_data); /* == __per_cpu_mca[smp_processor_id()] */
 DEFINE_PER_CPU(u64, ia64_mca_per_cpu_pte); /* PTE to map per-CPU area */
 DEFINE_PER_CPU(u64, ia64_mca_pal_pte);      /* PTE to map PAL code */
 DEFINE_PER_CPU(u64, ia64_mca_pal_base);    /* vaddr PAL code granule */
+DEFINE_PER_CPU(u64, ia64_mca_tr_reload);   /* Flag for TR reload */
 
 unsigned long __per_cpu_mca[NR_CPUS];
 
@@ -293,7 +296,8 @@ static void ia64_mlogbuf_dump_from_init(void)
         if (mlogbuf_finished)
                 return;
 
-        if (mlogbuf_timestamp && (mlogbuf_timestamp + 30*HZ > jiffies)) {
+        if (mlogbuf_timestamp &&
+                        time_before(jiffies, mlogbuf_timestamp + 30 * HZ)) {
                 printk(KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT "
                         " and the system seems to be messed up.\n");
                 ia64_mlogbuf_finish(0);
@@ -1182,6 +1186,49 @@ all_in:
         return;
 }
 
+/*  mca_insert_tr
+ *
+ *  Switch rid when TR reload and needed!
+ *  iord: 1: itr, 2: itr;
+ *
+*/
+static void mca_insert_tr(u64 iord)
+{
+
+        int i;
+        u64 old_rr;
+        struct ia64_tr_entry *p;
+        unsigned long psr;
+        int cpu = smp_processor_id();
+
+        psr = ia64_clear_ic();
+        for (i = IA64_TR_ALLOC_BASE; i < IA64_TR_ALLOC_MAX; i++) {
+                p = &__per_cpu_idtrs[cpu][iord-1][i];
+                if (p->pte & 0x1) {
+                        old_rr = ia64_get_rr(p->ifa);
+                        if (old_rr != p->rr) {
+                                ia64_set_rr(p->ifa, p->rr);
+                                ia64_srlz_d();
+                        }
+                        ia64_ptr(iord, p->ifa, p->itir >> 2);
+                        ia64_srlz_i();
+                        if (iord & 0x1) {
+                                ia64_itr(0x1, i, p->ifa, p->pte, p->itir >> 2);
+                                ia64_srlz_i();
+                        }
+                        if (iord & 0x2) {
+                                ia64_itr(0x2, i, p->ifa, p->pte, p->itir >> 2);
+                                ia64_srlz_i();
+                        }
+                        if (old_rr != p->rr) {
+                                ia64_set_rr(p->ifa, old_rr);
+                                ia64_srlz_d();
+                        }
+                }
+        }
+        ia64_set_psr(psr);
+}
+
 /*
  * ia64_mca_handler
  *
@@ -1266,16 +1313,17 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
         } else {
                 /* Dump buffered message to console */
                 ia64_mlogbuf_finish(1);
-#ifdef CONFIG_KEXEC
-                atomic_set(&kdump_in_progress, 1);
-                monarch_cpu = -1;
-#endif
         }
+
+        if (__get_cpu_var(ia64_mca_tr_reload)) {
+                mca_insert_tr(0x1); /*Reload dynamic itrs*/
+                mca_insert_tr(0x2); /*Reload dynamic itrs*/
+        }
+
         if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
                         == NOTIFY_STOP)
                 ia64_mca_spin(__func__);
 
-
         if (atomic_dec_return(&mca_count) > 0) {
                 int i;