x86/oprofile: fix initialization of arch_perfmon for core_i7

[safe/jmp/linux-2.6] / arch / x86 / oprofile / nmi_int.c

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index c31f87b..28ee490 100644 (file)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -31,6 +31,26 @@ static DEFINE_PER_CPU(unsigned long, saved_lvtpc);
 /* 0 == registered but off, 1 == registered and on */
 static int nmi_enabled = 0;
 
+/* common functions */
+
+u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
+                   struct op_counter_config *counter_config)
+{
+       u64 val = 0;
+       u16 event = (u16)counter_config->event;
+
+       val |= ARCH_PERFMON_EVENTSEL_INT;
+       val |= counter_config->user ? ARCH_PERFMON_EVENTSEL_USR : 0;
+       val |= counter_config->kernel ? ARCH_PERFMON_EVENTSEL_OS : 0;
+       val |= (counter_config->unit_mask & 0xFF) << 8;
+       event &= model->event_mask ? model->event_mask : 0xFF;
+       val |= event & 0xFF;
+       val |= (event & 0x0F00) << 24;
+
+       return val;
+}
+
+
 static int profile_exceptions_notify(struct notifier_block *self,
                                     unsigned long val, void *data)
 {
@@ -40,8 +60,9 @@ static int profile_exceptions_notify(struct notifier_block *self,
 
        switch (val) {
        case DIE_NMI:
-               if (model->check_ctrs(args->regs, &per_cpu(cpu_msrs, cpu)))
-                       ret = NOTIFY_STOP;
+       case DIE_NMI_IPI:
+               model->check_ctrs(args->regs, &per_cpu(cpu_msrs, cpu));
+               ret = NOTIFY_STOP;
                break;
        default:
                break;
@@ -51,26 +72,18 @@ static int profile_exceptions_notify(struct notifier_block *self,
 
 static void nmi_cpu_save_registers(struct op_msrs *msrs)
 {
-       unsigned int const nr_ctrs = model->num_counters;
-       unsigned int const nr_ctrls = model->num_controls;
        struct op_msr *counters = msrs->counters;
        struct op_msr *controls = msrs->controls;
        unsigned int i;
 
-       for (i = 0; i < nr_ctrs; ++i) {
-               if (counters[i].addr) {
-                       rdmsr(counters[i].addr,
-                               counters[i].saved.low,
-                               counters[i].saved.high);
-               }
+       for (i = 0; i < model->num_counters; ++i) {
+               if (counters[i].addr)
+                       rdmsrl(counters[i].addr, counters[i].saved);
        }
 
-       for (i = 0; i < nr_ctrls; ++i) {
-               if (controls[i].addr) {
-                       rdmsr(controls[i].addr,
-                               controls[i].saved.low,
-                               controls[i].saved.high);
-               }
+       for (i = 0; i < model->num_controls; ++i) {
+               if (controls[i].addr)
+                       rdmsrl(controls[i].addr, controls[i].saved);
        }
 }
 
@@ -134,7 +147,7 @@ static void nmi_cpu_setup(void *dummy)
 static struct notifier_block profile_exceptions_nb = {
        .notifier_call = profile_exceptions_notify,
        .next = NULL,
-       .priority = 0
+       .priority = 2
 };
 
 static int nmi_setup(void)
@@ -177,26 +190,18 @@ static int nmi_setup(void)
 
 static void nmi_restore_registers(struct op_msrs *msrs)
 {
-       unsigned int const nr_ctrs = model->num_counters;
-       unsigned int const nr_ctrls = model->num_controls;
        struct op_msr *counters = msrs->counters;
        struct op_msr *controls = msrs->controls;
        unsigned int i;
 
-       for (i = 0; i < nr_ctrls; ++i) {
-               if (controls[i].addr) {
-                       wrmsr(controls[i].addr,
-                               controls[i].saved.low,
-                               controls[i].saved.high);
-               }
+       for (i = 0; i < model->num_controls; ++i) {
+               if (controls[i].addr)
+                       wrmsrl(controls[i].addr, controls[i].saved);
        }
 
-       for (i = 0; i < nr_ctrs; ++i) {
-               if (counters[i].addr) {
-                       wrmsr(counters[i].addr,
-                               counters[i].saved.low,
-                               counters[i].saved.high);
-               }
+       for (i = 0; i < model->num_counters; ++i) {
+               if (counters[i].addr)
+                       wrmsrl(counters[i].addr, counters[i].saved);
        }
 }
 
@@ -401,6 +406,7 @@ module_param_call(cpu_type, force_cpu_type, NULL, NULL, 0);
 static int __init ppro_init(char **cpu_type)
 {
        __u8 cpu_model = boot_cpu_data.x86_model;
+       struct op_x86_model_spec const *spec = &op_ppro_spec;   /* default */
 
        if (force_arch_perfmon && cpu_has_arch_perfmon)
                return 0;
@@ -427,7 +433,7 @@ static int __init ppro_init(char **cpu_type)
                *cpu_type = "i386/core_2";
                break;
        case 26:
-               model = &op_arch_perfmon_spec;
+               spec = &op_arch_perfmon_spec;
                *cpu_type = "i386/core_i7";
                break;
        case 28:
@@ -438,7 +444,7 @@ static int __init ppro_init(char **cpu_type)
                return 0;
        }
 
-       model = &op_ppro_spec;
+       model = spec;
        return 1;
 }