aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Zhangjin <wuzhangjin@gmail.com>2010-05-06 13:29:48 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-05-21 16:31:19 -0400
commit893556e602d6d5d86ed401ff72bf63d8cfa4a9d0 (patch)
tree260e328986c231d6d3475a10aef9bf85ee3a0b65
parent852151bdb992874b3d625444a8c7c551f3a738b5 (diff)
MIPS: Oprofile: Loongson: Cleanup the comments
Removes some out-of-date comments and empty lines. Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1204/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/oprofile/op_model_loongson2.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c
index 515f7790c048..d0d24e047676 100644
--- a/arch/mips/oprofile/op_model_loongson2.c
+++ b/arch/mips/oprofile/op_model_loongson2.c
@@ -8,7 +8,6 @@
8 * This file is subject to the terms and conditions of the GNU General Public 8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file "COPYING" in the main directory of this archive 9 * License. See the file "COPYING" in the main directory of this archive
10 * for more details. 10 * for more details.
11 *
12 */ 11 */
13#include <linux/init.h> 12#include <linux/init.h>
14#include <linux/oprofile.h> 13#include <linux/oprofile.h>
@@ -17,11 +16,6 @@
17#include <loongson.h> /* LOONGSON2_PERFCNT_IRQ */ 16#include <loongson.h> /* LOONGSON2_PERFCNT_IRQ */
18#include "op_impl.h" 17#include "op_impl.h"
19 18
20/*
21 * a patch should be sent to oprofile with the loongson-specific support.
22 * otherwise, the oprofile tool will not recognize this and complain about
23 * "cpu_type 'unset' is not valid".
24 */
25#define LOONGSON2_CPU_TYPE "mips/loongson2" 19#define LOONGSON2_CPU_TYPE "mips/loongson2"
26 20
27#define LOONGSON2_PERFCNT_OVERFLOW (1ULL << 31) 21#define LOONGSON2_PERFCNT_OVERFLOW (1ULL << 31)
@@ -34,7 +28,6 @@
34#define LOONGSON2_PERFCTRL_EVENT(idx, event) \ 28#define LOONGSON2_PERFCTRL_EVENT(idx, event) \
35 (((event) & 0x0f) << ((idx) ? 9 : 5)) 29 (((event) & 0x0f) << ((idx) ? 9 : 5))
36 30
37/* Loongson2 performance counter register */
38#define read_c0_perfctrl() __read_64bit_c0_register($24, 0) 31#define read_c0_perfctrl() __read_64bit_c0_register($24, 0)
39#define write_c0_perfctrl(val) __write_64bit_c0_register($24, 0, val) 32#define write_c0_perfctrl(val) __write_64bit_c0_register($24, 0, val)
40#define read_c0_perfcnt() __read_64bit_c0_register($25, 0) 33#define read_c0_perfcnt() __read_64bit_c0_register($25, 0)
@@ -49,7 +42,6 @@ static struct loongson2_register_config {
49 42
50static char *oprofid = "LoongsonPerf"; 43static char *oprofid = "LoongsonPerf";
51static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id); 44static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id);
52/* Compute all of the registers in preparation for enabling profiling. */
53 45
54static void loongson2_reg_setup(struct op_counter_config *cfg) 46static void loongson2_reg_setup(struct op_counter_config *cfg)
55{ 47{
@@ -57,8 +49,11 @@ static void loongson2_reg_setup(struct op_counter_config *cfg)
57 49
58 reg.reset_counter1 = 0; 50 reg.reset_counter1 = 0;
59 reg.reset_counter2 = 0; 51 reg.reset_counter2 = 0;
60 /* Compute the performance counter ctrl word. */ 52
61 /* For now count kernel and user mode */ 53 /*
54 * Compute the performance counter ctrl word.
55 * For now, count kernel and user mode.
56 */
62 if (cfg[0].enabled) { 57 if (cfg[0].enabled) {
63 ctrl |= LOONGSON2_PERFCTRL_EVENT(0, cfg[0].event); 58 ctrl |= LOONGSON2_PERFCTRL_EVENT(0, cfg[0].event);
64 reg.reset_counter1 = 0x80000000ULL - cfg[0].count; 59 reg.reset_counter1 = 0x80000000ULL - cfg[0].count;
@@ -81,11 +76,8 @@ static void loongson2_reg_setup(struct op_counter_config *cfg)
81 76
82 reg.cnt1_enabled = cfg[0].enabled; 77 reg.cnt1_enabled = cfg[0].enabled;
83 reg.cnt2_enabled = cfg[1].enabled; 78 reg.cnt2_enabled = cfg[1].enabled;
84
85} 79}
86 80
87/* Program all of the registers in preparation for enabling profiling. */
88
89static void loongson2_cpu_setup(void *args) 81static void loongson2_cpu_setup(void *args)
90{ 82{
91 write_c0_perfcnt((reg.reset_counter2 << 32) | reg.reset_counter1); 83 write_c0_perfcnt((reg.reset_counter2 << 32) | reg.reset_counter1);
@@ -111,13 +103,6 @@ static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id)
111 struct pt_regs *regs = get_irq_regs(); 103 struct pt_regs *regs = get_irq_regs();
112 int enabled; 104 int enabled;
113 105
114 /*
115 * LOONGSON2 defines two 32-bit performance counters.
116 * To avoid a race updating the registers we need to stop the counters
117 * while we're messing with
118 * them ...
119 */
120
121 /* Check whether the irq belongs to me */ 106 /* Check whether the irq belongs to me */
122 enabled = read_c0_perfctrl() & LOONGSON2_PERFCTRL_ENABLE; 107 enabled = read_c0_perfctrl() & LOONGSON2_PERFCTRL_ENABLE;
123 if (!enabled) 108 if (!enabled)