[PATCH] powerpc: oprofile support for POWER6

POWER6 moves some of the MMCRA bits and also requires some bits to be
cleared each PMU interrupt.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 27 insertions, 23 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 7dcc01be4b09..83f9ab139d4c 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -237,6 +237,11 @@ struct cpu_spec	cpu_specs[] = {
                 .num_pmcs               = 6,
                 .oprofile_cpu_type      = "ppc64/power5",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
+                /* SIHV / SIPR bits are implemented on POWER4+ (GQ)
+                 * and above but only works on POWER5 and above
+                 */
+                .oprofile_mmcra_sihv    = MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                 .platform               = "power5",
         },
         {       /* Power5 GS */
@@ -250,6 +255,8 @@ struct cpu_spec	cpu_specs[] = {
                 .num_pmcs               = 6,
                 .oprofile_cpu_type      = "ppc64/power5+",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = MMCRA_SIPR,
                 .platform               = "power5+",
         },
         {       /* Power6 */
@@ -260,9 +267,13 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_POWER6,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
-                .num_pmcs               = 6,
+                .num_pmcs               = 8,
                 .oprofile_cpu_type      = "ppc64/power6",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
                 .platform               = "power6",
         },
         {       /* Cell Broadband Engine */
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 4c2beab1fdc1..506f6b79f893 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -24,10 +24,6 @@
 static unsigned long reset_value[OP_MAX_COUNTER];
 
 static int oprofile_running;
-static int mmcra_has_sihv;
-/* Unfortunately these bits vary between CPUs */
-static unsigned long mmcra_sihv = MMCRA_SIHV;
-static unsigned long mmcra_sipr = MMCRA_SIPR;
 
 /* mmcr values are set in power4_reg_setup, used in power4_cpu_setup */
 static u32 mmcr0_val;
@@ -41,16 +37,6 @@ static void power4_reg_setup(struct op_counter_config *ctr,
         int i;
 
         /*
-         * SIHV / SIPR bits are only implemented on POWER4+ (GQ) and above.
-         * However we disable it on all POWER4 until we verify it works
-         * (I was seeing some strange behaviour last time I tried).
-         *
-         * It has been verified to work on POWER5 so we enable it there.
-         */
-        if (cpu_has_feature(CPU_FTR_MMCRA_SIHV))
-                mmcra_has_sihv = 1;
-
-        /*
          * The performance counter event settings are given in the mmcr0,
          * mmcr1 and mmcra values passed from the user in the
          * op_system_config structure (sys variable).
@@ -202,18 +188,19 @@ static unsigned long get_pc(struct pt_regs *regs)
         unsigned long mmcra;
 
         /* Cant do much about it */
-        if (!mmcra_has_sihv)
+        if (!cur_cpu_spec->oprofile_mmcra_sihv)
                 return pc;
 
         mmcra = mfspr(SPRN_MMCRA);
 
         /* Were we in the hypervisor? */
-        if (firmware_has_feature(FW_FEATURE_LPAR) && (mmcra & mmcra_sihv))
+        if (firmware_has_feature(FW_FEATURE_LPAR) &&
+            (mmcra & cur_cpu_spec->oprofile_mmcra_sihv))
                 /* function descriptor madness */
                 return *((unsigned long *)hypervisor_bucket);
 
         /* We were in userspace, nothing to do */
-        if (mmcra & mmcra_sipr)
+        if (mmcra & cur_cpu_spec->oprofile_mmcra_sipr)
                 return pc;
 
 #ifdef CONFIG_PPC_RTAS
@@ -235,15 +222,14 @@ static unsigned long get_pc(struct pt_regs *regs)
         return pc;
 }
 
-static int get_kernel(unsigned long pc)
+static int get_kernel(unsigned long pc, unsigned long mmcra)
 {
         int is_kernel;
 
-        if (!mmcra_has_sihv) {
+        if (!cur_cpu_spec->oprofile_mmcra_sihv) {
                 is_kernel = is_kernel_addr(pc);
         } else {
-                unsigned long mmcra = mfspr(SPRN_MMCRA);
-                is_kernel = ((mmcra & mmcra_sipr) == 0);
+                is_kernel = ((mmcra & cur_cpu_spec->oprofile_mmcra_sipr) == 0);
         }
 
         return is_kernel;
@@ -257,9 +243,12 @@ static void power4_handle_interrupt(struct pt_regs *regs,
         int val;
         int i;
         unsigned int mmcr0;
+        unsigned long mmcra;
+
+        mmcra = mfspr(SPRN_MMCRA);
 
         pc = get_pc(regs);
-        is_kernel = get_kernel(pc);
+        is_kernel = get_kernel(pc, mmcra);
 
         /* set the PMM bit (see comment below) */
         mtmsrd(mfmsr() | MSR_PMM);
@@ -287,6 +276,10 @@ static void power4_handle_interrupt(struct pt_regs *regs,
          */
         mmcr0 &= ~MMCR0_PMAO;
 
+        /* Clear the appropriate bits in the MMCRA */
+        mmcra &= ~cur_cpu_spec->oprofile_mmcra_clear;
+        mtspr(SPRN_MMCRA, mmcra);
+
         /*
          * now clear the freeze bit, counting will not start until we
          * rfid from this exception, because only at that point will