1 files changed, 33 insertions, 29 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 9817506dd469..7d01be868870 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -79,6 +79,8 @@ static unsigned char shared_bank[NR_BANKS] = {
 
 static DEFINE_PER_CPU(unsigned char, bank_map); /* see which banks are on */
 
+static void amd_threshold_interrupt(void);
+
 /*
  * CPU Initialization
  */
@@ -90,7 +92,8 @@ struct thresh_restart {
 };
 
 /* must be called with correct cpu affinity */
-static long threshold_restart_bank(void *_tr)
+/* Called via smp_call_function_single() */
+static void threshold_restart_bank(void *_tr)
 {
         struct thresh_restart *tr = _tr;
         u32 mci_misc_hi, mci_misc_lo;
@@ -117,7 +120,6 @@ static long threshold_restart_bank(void *_tr)
 
         mci_misc_hi |= MASK_COUNT_EN_HI;
         wrmsr(tr->b->address, mci_misc_lo, mci_misc_hi);
-        return 0;
 }
 
 /* cpu init entry point, called from mce.c with preempt off */
@@ -174,6 +176,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
                         tr.reset = 0;
                         tr.old_limit = 0;
                         threshold_restart_bank(&tr);
+
+                        mce_threshold_vector = amd_threshold_interrupt;
                 }
         }
 }
@@ -187,19 +191,13 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
  * the interrupt goes off when error_count reaches threshold_limit.
  * the handler will simply log mcelog w/ software defined bank number.
  */
-asmlinkage void mce_threshold_interrupt(void)
+static void amd_threshold_interrupt(void)
 {
         unsigned int bank, block;
         struct mce m;
         u32 low = 0, high = 0, address = 0;
 
-        ack_APIC_irq();
-        exit_idle();
-        irq_enter();
-
-        memset(&m, 0, sizeof(m));
-        rdtscll(m.tsc);
-        m.cpu = smp_processor_id();
+        mce_setup(&m);
 
         /* assume first bank caused it */
         for (bank = 0; bank < NR_BANKS; ++bank) {
@@ -233,7 +231,8 @@ asmlinkage void mce_threshold_interrupt(void)
 
                         /* Log the machine check that caused the threshold
                            event. */
-                        do_machine_check(NULL, 0);
+                        machine_check_poll(MCP_TIMESTAMP,
+                                        &__get_cpu_var(mce_poll_banks));
 
                         if (high & MASK_OVERFLOW_HI) {
                                 rdmsrl(address, m.misc);
@@ -243,13 +242,10 @@ asmlinkage void mce_threshold_interrupt(void)
                                        + bank * NR_BLOCKS
                                        + block;
                                 mce_log(&m);
-                                goto out;
+                                return;
                         }
                 }
         }
-out:
-        inc_irq_stat(irq_threshold_count);
-        irq_exit();
 }
 
 /*
@@ -283,7 +279,7 @@ static ssize_t store_interrupt_enable(struct threshold_block *b,
         tr.b = b;
         tr.reset = 0;
         tr.old_limit = 0;
-        work_on_cpu(b->cpu, threshold_restart_bank, &tr);
+        smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
 
         return end - buf;
 }
@@ -305,23 +301,32 @@ static ssize_t store_threshold_limit(struct threshold_block *b,
         tr.b = b;
         tr.reset = 0;
 
-        work_on_cpu(b->cpu, threshold_restart_bank, &tr);
+        smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
 
         return end - buf;
 }
 
-static long local_error_count(void *_b)
+struct threshold_block_cross_cpu {
+        struct threshold_block *tb;
+        long retval;
+};
+
+static void local_error_count_handler(void *_tbcc)
 {
-        struct threshold_block *b = _b;
+        struct threshold_block_cross_cpu *tbcc = _tbcc;
+        struct threshold_block *b = tbcc->tb;
         u32 low, high;
 
         rdmsr(b->address, low, high);
-        return (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit);
+        tbcc->retval = (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit);
 }
 
 static ssize_t show_error_count(struct threshold_block *b, char *buf)
 {
-        return sprintf(buf, "%lx\n", work_on_cpu(b->cpu, local_error_count, b));
+        struct threshold_block_cross_cpu tbcc = { .tb = b, };
+
+        smp_call_function_single(b->cpu, local_error_count_handler, &tbcc, 1);
+        return sprintf(buf, "%lx\n", tbcc.retval);
 }
 
 static ssize_t store_error_count(struct threshold_block *b,
@@ -329,7 +334,7 @@ static ssize_t store_error_count(struct threshold_block *b,
 {
         struct thresh_restart tr = { .b = b, .reset = 1, .old_limit = 0 };
 
-        work_on_cpu(b->cpu, threshold_restart_bank, &tr);
+        smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1);
         return 1;
 }
 
@@ -398,7 +403,7 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
         if ((bank >= NR_BANKS) || (block >= NR_BLOCKS))
                 return 0;
 
-        if (rdmsr_safe(address, &low, &high))
+        if (rdmsr_safe_on_cpu(cpu, address, &low, &high))
                 return 0;
 
         if (!(high & MASK_VALID_HI)) {
@@ -462,12 +467,11 @@ out_free:
         return err;
 }
 
-static __cpuinit long local_allocate_threshold_blocks(void *_bank)
+static __cpuinit long
+local_allocate_threshold_blocks(int cpu, unsigned int bank)
 {
-        unsigned int *bank = _bank;
-
-        return allocate_threshold_blocks(smp_processor_id(), *bank, 0,
-                                         MSR_IA32_MC0_MISC + *bank * 4);
+        return allocate_threshold_blocks(cpu, bank, 0,
+                                         MSR_IA32_MC0_MISC + bank * 4);
 }
 
 /* symlinks sibling shared banks to first core.  first core owns dir/files. */
@@ -530,7 +534,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 
         per_cpu(threshold_banks, cpu)[bank] = b;
 
-        err = work_on_cpu(cpu, local_allocate_threshold_blocks, &bank);
+        err = local_allocate_threshold_blocks(cpu, bank);
         if (err)
                 goto out_free;