[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

[firefly-linux-kernel-4.4.55.git] / arch / mips / oprofile / op_model_mipsxx.c

diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index d36b64dfcb2fd05094fb77805875de7af3a572ed..1d1eee407faf971a86b8f63b543aae90957d8ddd 100644 (file)
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -114,11 +114,12 @@ static void mipsxx_cpu_stop(void *args)
        }
 }
 
-static void mipsxx_perfcount_handler(struct pt_regs *regs)
+static int mipsxx_perfcount_handler(struct pt_regs *regs)
 {
        unsigned int counters = op_model_mipsxx.num_counters;
        unsigned int control;
        unsigned int counter;
+       int handled = 0;
 
        switch (counters) {
 #define HANDLE_COUNTER(n)                                              \
@@ -129,12 +130,15 @@ static void mipsxx_perfcount_handler(struct pt_regs *regs)
                    (counter & M_COUNTER_OVERFLOW)) {                   \
                        oprofile_add_sample(regs, n);                   \
                        write_c0_perfcntr ## n(reg.counter[n]);         \
+                       handled = 1;                                    \
                }
        HANDLE_COUNTER(3)
        HANDLE_COUNTER(2)
        HANDLE_COUNTER(1)
        HANDLE_COUNTER(0)
        }
+
+       return handled;
 }
 
 #define M_CONFIG1_PC   (1 << 4)
@@ -176,17 +180,31 @@ static int __init mipsxx_init(void)
        int counters;
 
        counters = n_counters();
-       if (counters == 0)
+       if (counters == 0) {
+               printk(KERN_ERR "Oprofile: CPU has no performance counters\n");
                return -ENODEV;
+       }
 
        reset_counters(counters);
 
        op_model_mipsxx.num_counters = counters;
        switch (current_cpu_data.cputype) {
+       case CPU_20KC:
+               op_model_mipsxx.cpu_type = "mips/20K";
+               break;
+
        case CPU_24K:
                op_model_mipsxx.cpu_type = "mips/24K";
                break;
 
+       case CPU_25KF:
+               op_model_mipsxx.cpu_type = "mips/25K";
+               break;
+
+       case CPU_5KC:
+               op_model_mipsxx.cpu_type = "mips/5K";
+               break;
+
        default:
                printk(KERN_ERR "Profiling unsupported for this CPU\n");