x86: perf_counter cleanup
[pandora-kernel.git] / arch / x86 / kernel / cpu / perf_counter.c
index 8bb2133..155bc3c 100644 (file)
@@ -3,6 +3,7 @@
  *
  *  Copyright(C) 2008 Thomas Gleixner <tglx@linutronix.de>
  *  Copyright(C) 2008 Red Hat, Inc., Ingo Molnar
+ *  Copyright(C) 2009 Jaswinder Singh Rajput
  *
  *  For licencing details see kernel-base/COPYING
  */
@@ -16,7 +17,6 @@
 #include <linux/kdebug.h>
 #include <linux/sched.h>
 
-#include <asm/perf_counter.h>
 #include <asm/apic.h>
 
 static bool perf_counters_initialized __read_mostly;
@@ -27,6 +27,7 @@ static bool perf_counters_initialized __read_mostly;
 static int nr_counters_generic __read_mostly;
 static u64 perf_counter_mask __read_mostly;
 static u64 counter_value_mask __read_mostly;
+static int counter_value_bits __read_mostly;
 
 static int nr_counters_fixed __read_mostly;
 
@@ -34,15 +35,38 @@ struct cpu_hw_counters {
        struct perf_counter     *counters[X86_PMC_IDX_MAX];
        unsigned long           used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
        unsigned long           interrupts;
-       u64                     global_enable;
+       u64                     throttle_ctrl;
+       unsigned long           active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
+       int                     enabled;
 };
 
 /*
- * Intel PerfMon v3. Used on Core2 and later.
+ * struct pmc_x86_ops - performance counter x86 ops
  */
-static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters);
+struct pmc_x86_ops {
+       u64             (*save_disable_all)(void);
+       void            (*restore_all)(u64);
+       u64             (*get_status)(u64);
+       void            (*ack_status)(u64);
+       void            (*enable)(int, u64);
+       void            (*disable)(int, u64);
+       unsigned        eventsel;
+       unsigned        perfctr;
+       u64             (*event_map)(int);
+       u64             (*raw_event)(u64);
+       int             max_events;
+};
 
-static const int intel_perfmon_event_map[] =
+static struct pmc_x86_ops *pmc_ops;
+
+static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = {
+       .enabled = 1,
+};
+
+/*
+ * Intel PerfMon v3. Used on Core2 and later.
+ */
+static const u64 intel_perfmon_event_map[] =
 {
   [PERF_COUNT_CPU_CYCLES]              = 0x003c,
   [PERF_COUNT_INSTRUCTIONS]            = 0x00c0,
@@ -53,7 +77,56 @@ static const int intel_perfmon_event_map[] =
   [PERF_COUNT_BUS_CYCLES]              = 0x013c,
 };
 
-static const int max_intel_perfmon_events = ARRAY_SIZE(intel_perfmon_event_map);
+static u64 pmc_intel_event_map(int event)
+{
+       return intel_perfmon_event_map[event];
+}
+
+static u64 pmc_intel_raw_event(u64 event)
+{
+#define CORE_EVNTSEL_EVENT_MASK                0x000000FF
+#define CORE_EVNTSEL_UNIT_MASK         0x0000FF00
+#define CORE_EVNTSEL_COUNTER_MASK      0xFF000000
+
+#define CORE_EVNTSEL_MASK              \
+       (CORE_EVNTSEL_EVENT_MASK |      \
+        CORE_EVNTSEL_UNIT_MASK  |      \
+        CORE_EVNTSEL_COUNTER_MASK)
+
+       return event & CORE_EVNTSEL_MASK;
+}
+
+/*
+ * AMD Performance Monitor K7 and later.
+ */
+static const u64 amd_perfmon_event_map[] =
+{
+  [PERF_COUNT_CPU_CYCLES]              = 0x0076,
+  [PERF_COUNT_INSTRUCTIONS]            = 0x00c0,
+  [PERF_COUNT_CACHE_REFERENCES]                = 0x0080,
+  [PERF_COUNT_CACHE_MISSES]            = 0x0081,
+  [PERF_COUNT_BRANCH_INSTRUCTIONS]     = 0x00c4,
+  [PERF_COUNT_BRANCH_MISSES]           = 0x00c5,
+};
+
+static u64 pmc_amd_event_map(int event)
+{
+       return amd_perfmon_event_map[event];
+}
+
+static u64 pmc_amd_raw_event(u64 event)
+{
+#define K7_EVNTSEL_EVENT_MASK  0x7000000FF
+#define K7_EVNTSEL_UNIT_MASK   0x00000FF00
+#define K7_EVNTSEL_COUNTER_MASK        0x0FF000000
+
+#define K7_EVNTSEL_MASK                        \
+       (K7_EVNTSEL_EVENT_MASK |        \
+        K7_EVNTSEL_UNIT_MASK  |        \
+        K7_EVNTSEL_COUNTER_MASK)
+
+       return event & K7_EVNTSEL_MASK;
+}
 
 /*
  * Propagate counter elapsed time into the generic counter.
@@ -107,21 +180,25 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
                return -EINVAL;
 
        /*
-        * Count user events, and generate PMC IRQs:
+        * Generate PMC IRQs:
         * (keep 'enabled' bit clear for now)
         */
-       hwc->config = ARCH_PERFMON_EVENTSEL_USR | ARCH_PERFMON_EVENTSEL_INT;
+       hwc->config = ARCH_PERFMON_EVENTSEL_INT;
 
        /*
-        * If privileged enough, count OS events too, and allow
-        * NMI events as well:
+        * Count user and OS events unless requested not to.
         */
-       hwc->nmi = 0;
-       if (capable(CAP_SYS_ADMIN)) {
+       if (!hw_event->exclude_user)
+               hwc->config |= ARCH_PERFMON_EVENTSEL_USR;
+       if (!hw_event->exclude_kernel)
                hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
-               if (hw_event->nmi)
-                       hwc->nmi = 1;
-       }
+
+       /*
+        * If privileged enough, allow NMI events:
+        */
+       hwc->nmi = 0;
+       if (capable(CAP_SYS_ADMIN) && hw_event->nmi)
+               hwc->nmi = 1;
 
        hwc->irq_period         = hw_event->irq_period;
        /*
@@ -129,8 +206,9 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
         * so we install an artificial 1<<31 period regardless of
         * the generic counter period:
         */
-       if ((s64)hwc->irq_period <= 0 || hwc->irq_period > 0x7FFFFFFF)
-               hwc->irq_period = 0x7FFFFFFF;
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+               if ((s64)hwc->irq_period <= 0 || hwc->irq_period > 0x7FFFFFFF)
+                       hwc->irq_period = 0x7FFFFFFF;
 
        atomic64_set(&hwc->period_left, hwc->irq_period);
 
@@ -138,43 +216,203 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
         * Raw event type provide the config in the event structure
         */
        if (hw_event->raw) {
-               hwc->config |= hw_event->type;
+               hwc->config |= pmc_ops->raw_event(hw_event->type);
        } else {
-               if (hw_event->type >= max_intel_perfmon_events)
+               if (hw_event->type >= pmc_ops->max_events)
                        return -EINVAL;
                /*
                 * The generic map:
                 */
-               hwc->config |= intel_perfmon_event_map[hw_event->type];
+               hwc->config |= pmc_ops->event_map(hw_event->type);
        }
        counter->wakeup_pending = 0;
 
        return 0;
 }
 
-u64 hw_perf_save_disable(void)
+static u64 pmc_intel_save_disable_all(void)
 {
        u64 ctrl;
 
-       if (unlikely(!perf_counters_initialized))
-               return 0;
-
        rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
        wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
 
        return ctrl;
 }
+
+static u64 pmc_amd_save_disable_all(void)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+       int enabled, idx;
+
+       enabled = cpuc->enabled;
+       cpuc->enabled = 0;
+       barrier();
+
+       for (idx = 0; idx < nr_counters_generic; idx++) {
+               u64 val;
+
+               rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               if (val & ARCH_PERFMON_EVENTSEL0_ENABLE) {
+                       val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
+                       wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               }
+       }
+
+       return enabled;
+}
+
+u64 hw_perf_save_disable(void)
+{
+       if (unlikely(!perf_counters_initialized))
+               return 0;
+
+       return pmc_ops->save_disable_all();
+}
+/*
+ * Exported because of ACPI idle
+ */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
+static void pmc_intel_restore_all(u64 ctrl)
+{
+       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+}
+
+static void pmc_amd_restore_all(u64 ctrl)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+       int idx;
+
+       cpuc->enabled = ctrl;
+       barrier();
+       if (!ctrl)
+               return;
+
+       for (idx = 0; idx < nr_counters_generic; idx++) {
+               if (test_bit(idx, cpuc->active_mask)) {
+                       u64 val;
+
+                       rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
+                       val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+                       wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               }
+       }
+}
+
 void hw_perf_restore(u64 ctrl)
 {
        if (unlikely(!perf_counters_initialized))
                return;
 
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+       pmc_ops->restore_all(ctrl);
 }
+/*
+ * Exported because of ACPI idle
+ */
 EXPORT_SYMBOL_GPL(hw_perf_restore);
 
+static u64 pmc_intel_get_status(u64 mask)
+{
+       u64 status;
+
+       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+
+       return status;
+}
+
+static u64 pmc_amd_get_status(u64 mask)
+{
+       u64 status = 0;
+       int idx;
+
+       for (idx = 0; idx < nr_counters_generic; idx++) {
+               s64 val;
+
+               if (!(mask & (1 << idx)))
+                       continue;
+
+               rdmsrl(MSR_K7_PERFCTR0 + idx, val);
+               val <<= (64 - counter_value_bits);
+               if (val >= 0)
+                       status |= (1 << idx);
+       }
+
+       return status;
+}
+
+static u64 hw_perf_get_status(u64 mask)
+{
+       if (unlikely(!perf_counters_initialized))
+               return 0;
+
+       return pmc_ops->get_status(mask);
+}
+
+static void pmc_intel_ack_status(u64 ack)
+{
+       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
+}
+
+static void pmc_amd_ack_status(u64 ack)
+{
+}
+
+static void hw_perf_ack_status(u64 ack)
+{
+       if (unlikely(!perf_counters_initialized))
+               return;
+
+       pmc_ops->ack_status(ack);
+}
+
+static void pmc_intel_enable(int idx, u64 config)
+{
+       wrmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx,
+                       config | ARCH_PERFMON_EVENTSEL0_ENABLE);
+}
+
+static void pmc_amd_enable(int idx, u64 config)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+
+       set_bit(idx, cpuc->active_mask);
+       if (cpuc->enabled)
+               config |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+
+       wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
+}
+
+static void hw_perf_enable(int idx, u64 config)
+{
+       if (unlikely(!perf_counters_initialized))
+               return;
+
+       pmc_ops->enable(idx, config);
+}
+
+static void pmc_intel_disable(int idx, u64 config)
+{
+       wrmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx, config);
+}
+
+static void pmc_amd_disable(int idx, u64 config)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+
+       clear_bit(idx, cpuc->active_mask);
+       wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
+
+}
+
+static void hw_perf_disable(int idx, u64 config)
+{
+       if (unlikely(!perf_counters_initialized))
+               return;
+
+       pmc_ops->disable(idx, config);
+}
+
 static inline void
 __pmc_fixed_disable(struct perf_counter *counter,
                    struct hw_perf_counter *hwc, unsigned int __idx)
@@ -197,7 +435,7 @@ __pmc_generic_disable(struct perf_counter *counter,
        if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL))
                __pmc_fixed_disable(counter, hwc, idx);
        else
-               wrmsr_safe(hwc->config_base + idx, hwc->config, 0);
+               hw_perf_disable(idx, hwc->config);
 }
 
 static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
@@ -248,10 +486,13 @@ __pmc_fixed_enable(struct perf_counter *counter,
        int err;
 
        /*
-        * Enable IRQ generation (0x8) and ring-3 counting (0x2),
-        * and enable ring-0 counting if allowed:
+        * Enable IRQ generation (0x8),
+        * and enable ring-3 counting (0x2) and ring-0 counting (0x1)
+        * if requested:
         */
-       bits = 0x8ULL | 0x2ULL;
+       bits = 0x8ULL;
+       if (hwc->config & ARCH_PERFMON_EVENTSEL_USR)
+               bits |= 0x2;
        if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
                bits |= 0x1;
        bits <<= (idx * 4);
@@ -270,8 +511,7 @@ __pmc_generic_enable(struct perf_counter *counter,
        if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL))
                __pmc_fixed_enable(counter, hwc, idx);
        else
-               wrmsr(hwc->config_base + idx,
-                     hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE, 0);
+               hw_perf_enable(idx, hwc->config);
 }
 
 static int
@@ -279,16 +519,19 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)
 {
        unsigned int event;
 
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+               return -1;
+
        if (unlikely(hwc->nmi))
                return -1;
 
        event = hwc->config & ARCH_PERFMON_EVENT_MASK;
 
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_INSTRUCTIONS]))
+       if (unlikely(event == pmc_ops->event_map(PERF_COUNT_INSTRUCTIONS)))
                return X86_PMC_IDX_FIXED_INSTRUCTIONS;
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_CPU_CYCLES]))
+       if (unlikely(event == pmc_ops->event_map(PERF_COUNT_CPU_CYCLES)))
                return X86_PMC_IDX_FIXED_CPU_CYCLES;
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_BUS_CYCLES]))
+       if (unlikely(event == pmc_ops->event_map(PERF_COUNT_BUS_CYCLES)))
                return X86_PMC_IDX_FIXED_BUS_CYCLES;
 
        return -1;
@@ -332,8 +575,8 @@ try_generic:
                        set_bit(idx, cpuc->used);
                        hwc->idx = idx;
                }
-               hwc->config_base  = MSR_ARCH_PERFMON_EVENTSEL0;
-               hwc->counter_base = MSR_ARCH_PERFMON_PERFCTR0;
+               hwc->config_base  = pmc_ops->eventsel;
+               hwc->counter_base = pmc_ops->perfctr;
        }
 
        perf_counters_lapic_init(hwc->nmi);
@@ -366,35 +609,37 @@ void perf_counter_print_debug(void)
        cpu = smp_processor_id();
        cpuc = &per_cpu(cpu_hw_counters, cpu);
 
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
-       rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
-       rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
-
-       printk(KERN_INFO "\n");
-       printk(KERN_INFO "CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
-       printk(KERN_INFO "CPU#%d: status:     %016llx\n", cpu, status);
-       printk(KERN_INFO "CPU#%d: overflow:   %016llx\n", cpu, overflow);
-       printk(KERN_INFO "CPU#%d: fixed:      %016llx\n", cpu, fixed);
-       printk(KERN_INFO "CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
+               rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
+               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
+
+               pr_info("\n");
+               pr_info("CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
+               pr_info("CPU#%d: status:     %016llx\n", cpu, status);
+               pr_info("CPU#%d: overflow:   %016llx\n", cpu, overflow);
+               pr_info("CPU#%d: fixed:      %016llx\n", cpu, fixed);
+       }
+       pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);
 
        for (idx = 0; idx < nr_counters_generic; idx++) {
-               rdmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx, pmc_ctrl);
-               rdmsrl(MSR_ARCH_PERFMON_PERFCTR0  + idx, pmc_count);
+               rdmsrl(pmc_ops->eventsel + idx, pmc_ctrl);
+               rdmsrl(pmc_ops->perfctr  + idx, pmc_count);
 
                prev_left = per_cpu(prev_left[idx], cpu);
 
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
                        cpu, idx, pmc_ctrl);
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d count: %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d count: %016llx\n",
                        cpu, idx, pmc_count);
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d left:  %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d left:  %016llx\n",
                        cpu, idx, prev_left);
        }
        for (idx = 0; idx < nr_counters_fixed; idx++) {
                rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count);
 
-               printk(KERN_INFO "CPU#%d: fixed-PMC%d count: %016llx\n",
+               pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
                        cpu, idx, pmc_count);
        }
        local_irq_enable();
@@ -472,29 +717,28 @@ perf_handle_group(struct perf_counter *sibling, u64 *status, u64 *overflown)
 /*
  * Maximum interrupt frequency of 100KHz per CPU
  */
-#define PERFMON_MAX_INTERRUPTS 100000/HZ
+#define PERFMON_MAX_INTERRUPTS (100000/HZ)
 
 /*
  * This handler is triggered by the local APIC, so the APIC IRQ handling
  * rules apply:
  */
-static void __smp_perf_counter_interrupt(struct pt_regs *regs, int nmi)
+static int __smp_perf_counter_interrupt(struct pt_regs *regs, int nmi)
 {
        int bit, cpu = smp_processor_id();
        u64 ack, status;
        struct cpu_hw_counters *cpuc = &per_cpu(cpu_hw_counters, cpu);
+       int ret = 0;
 
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+       cpuc->throttle_ctrl = hw_perf_save_disable();
 
-       /* Disable counters globally */
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
-       ack_APIC_irq();
-
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+       status = hw_perf_get_status(cpuc->throttle_ctrl);
        if (!status)
                goto out;
 
+       ret = 1;
 again:
+       inc_irq_stat(apic_perf_irqs);
        ack = status;
        for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
                struct perf_counter *counter = cpuc->counters[bit];
@@ -528,12 +772,12 @@ again:
                }
        }
 
-       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
+       hw_perf_ack_status(ack);
 
        /*
         * Repeat if there is more work to be done:
         */
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+       status = hw_perf_get_status(cpuc->throttle_ctrl);
        if (status)
                goto again;
 out:
@@ -541,13 +785,14 @@ out:
         * Restore - do not reenable when global enable is off or throttled:
         */
        if (++cpuc->interrupts < PERFMON_MAX_INTERRUPTS)
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+               hw_perf_restore(cpuc->throttle_ctrl);
+
+       return ret;
 }
 
 void perf_counter_unthrottle(void)
 {
        struct cpu_hw_counters *cpuc;
-       u64 global_enable;
 
        if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
                return;
@@ -555,25 +800,21 @@ void perf_counter_unthrottle(void)
        if (unlikely(!perf_counters_initialized))
                return;
 
-       cpuc = &per_cpu(cpu_hw_counters, smp_processor_id());
+       cpuc = &__get_cpu_var(cpu_hw_counters);
        if (cpuc->interrupts >= PERFMON_MAX_INTERRUPTS) {
                if (printk_ratelimit())
                        printk(KERN_WARNING "PERFMON: max interrupts exceeded!\n");
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+               hw_perf_restore(cpuc->throttle_ctrl);
        }
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, global_enable);
-       if (unlikely(cpuc->global_enable && !global_enable))
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
        cpuc->interrupts = 0;
 }
 
 void smp_perf_counter_interrupt(struct pt_regs *regs)
 {
        irq_enter();
-       inc_irq_stat(apic_perf_irqs);
        apic_write(APIC_LVTPC, LOCAL_PERF_VECTOR);
+       ack_APIC_irq();
        __smp_perf_counter_interrupt(regs, 0);
-
        irq_exit();
 }
 
@@ -630,16 +871,23 @@ perf_counter_nmi_handler(struct notifier_block *self,
 {
        struct die_args *args = __args;
        struct pt_regs *regs;
+       int ret;
 
-       if (likely(cmd != DIE_NMI_IPI))
+       switch (cmd) {
+       case DIE_NMI:
+       case DIE_NMI_IPI:
+               break;
+
+       default:
                return NOTIFY_DONE;
+       }
 
        regs = args->regs;
 
        apic_write(APIC_LVTPC, APIC_DM_NMI);
-       __smp_perf_counter_interrupt(regs, 1);
+       ret = __smp_perf_counter_interrupt(regs, 1);
 
-       return NOTIFY_STOP;
+       return ret ? NOTIFY_STOP : NOTIFY_OK;
 }
 
 static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
@@ -648,29 +896,90 @@ static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
        .priority               = 1
 };
 
-void __init init_hw_perf_counters(void)
+static struct pmc_x86_ops pmc_intel_ops = {
+       .save_disable_all       = pmc_intel_save_disable_all,
+       .restore_all            = pmc_intel_restore_all,
+       .get_status             = pmc_intel_get_status,
+       .ack_status             = pmc_intel_ack_status,
+       .enable                 = pmc_intel_enable,
+       .disable                = pmc_intel_disable,
+       .eventsel               = MSR_ARCH_PERFMON_EVENTSEL0,
+       .perfctr                = MSR_ARCH_PERFMON_PERFCTR0,
+       .event_map              = pmc_intel_event_map,
+       .raw_event              = pmc_intel_raw_event,
+       .max_events             = ARRAY_SIZE(intel_perfmon_event_map),
+};
+
+static struct pmc_x86_ops pmc_amd_ops = {
+       .save_disable_all       = pmc_amd_save_disable_all,
+       .restore_all            = pmc_amd_restore_all,
+       .get_status             = pmc_amd_get_status,
+       .ack_status             = pmc_amd_ack_status,
+       .enable                 = pmc_amd_enable,
+       .disable                = pmc_amd_disable,
+       .eventsel               = MSR_K7_EVNTSEL0,
+       .perfctr                = MSR_K7_PERFCTR0,
+       .event_map              = pmc_amd_event_map,
+       .raw_event              = pmc_amd_raw_event,
+       .max_events             = ARRAY_SIZE(amd_perfmon_event_map),
+};
+
+static struct pmc_x86_ops *pmc_intel_init(void)
 {
        union cpuid10_eax eax;
        unsigned int ebx;
        unsigned int unused;
        union cpuid10_edx edx;
 
-       if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
-               return;
-
        /*
         * Check whether the Architectural PerfMon supports
         * Branch Misses Retired Event or not.
         */
        cpuid(10, &eax.full, &ebx, &unused, &edx.full);
        if (eax.split.mask_length <= ARCH_PERFMON_BRANCH_MISSES_RETIRED)
-               return;
+               return NULL;
 
-       printk(KERN_INFO "Intel Performance Monitoring support detected.\n");
+       pr_info("Intel Performance Monitoring support detected.\n");
+       pr_info("... version:         %d\n", eax.split.version_id);
+       pr_info("... bit width:       %d\n", eax.split.bit_width);
+       pr_info("... mask length:     %d\n", eax.split.mask_length);
 
-       printk(KERN_INFO "... version:         %d\n", eax.split.version_id);
-       printk(KERN_INFO "... num counters:    %d\n", eax.split.num_counters);
        nr_counters_generic = eax.split.num_counters;
+       nr_counters_fixed = edx.split.num_counters_fixed;
+       counter_value_mask = (1ULL << eax.split.bit_width) - 1;
+
+       return &pmc_intel_ops;
+}
+
+static struct pmc_x86_ops *pmc_amd_init(void)
+{
+       nr_counters_generic = 4;
+       nr_counters_fixed = 0;
+       counter_value_mask = 0x0000FFFFFFFFFFFFULL;
+       counter_value_bits = 48;
+
+       pr_info("AMD Performance Monitoring support detected.\n");
+
+       return &pmc_amd_ops;
+}
+
+void __init init_hw_perf_counters(void)
+{
+       if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
+               return;
+
+       switch (boot_cpu_data.x86_vendor) {
+       case X86_VENDOR_INTEL:
+               pmc_ops = pmc_intel_init();
+               break;
+       case X86_VENDOR_AMD:
+               pmc_ops = pmc_amd_init();
+               break;
+       }
+       if (!pmc_ops)
+               return;
+
+       pr_info("... num counters:    %d\n", nr_counters_generic);
        if (nr_counters_generic > X86_PMC_MAX_GENERIC) {
                nr_counters_generic = X86_PMC_MAX_GENERIC;
                WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
@@ -679,23 +988,18 @@ void __init init_hw_perf_counters(void)
        perf_counter_mask = (1 << nr_counters_generic) - 1;
        perf_max_counters = nr_counters_generic;
 
-       printk(KERN_INFO "... bit width:       %d\n", eax.split.bit_width);
-       counter_value_mask = (1ULL << eax.split.bit_width) - 1;
-       printk(KERN_INFO "... value mask:      %016Lx\n", counter_value_mask);
-
-       printk(KERN_INFO "... mask length:     %d\n", eax.split.mask_length);
+       pr_info("... value mask:      %016Lx\n", counter_value_mask);
 
-       nr_counters_fixed = edx.split.num_counters_fixed;
        if (nr_counters_fixed > X86_PMC_MAX_FIXED) {
                nr_counters_fixed = X86_PMC_MAX_FIXED;
                WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",
                        nr_counters_fixed, X86_PMC_MAX_FIXED);
        }
-       printk(KERN_INFO "... fixed counters:  %d\n", nr_counters_fixed);
+       pr_info("... fixed counters:  %d\n", nr_counters_fixed);
 
        perf_counter_mask |= ((1LL << nr_counters_fixed)-1) << X86_PMC_IDX_FIXED;
 
-       printk(KERN_INFO "... counter mask:    %016Lx\n", perf_counter_mask);
+       pr_info("... counter mask:    %016Lx\n", perf_counter_mask);
        perf_counters_initialized = true;
 
        perf_counters_lapic_init(0);