Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

metag: perf: don't reset TXTACTCYC

Browse Source 
The thread active cycle counter TXTACTCYC is used in __delay so it
shouldn't really be reset to zero by perf. Fix perf to just read the
value, and instead of clearing it, record the prev_count value in
enable_counter so that the delta calculations know about the previous
value.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
This commit is contained in:
James Hogan 2013-02-27 21:54:51 +00:00
parent 9344de1b1c
commit 1fb4dc5c39
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/metag/kernel/perf/perf_event.c
View File

@ -617,9 +617,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
WARN_ONCE((config != 0x100), WARN_ONCE((config != 0x100),
"invalid configuration (%d) for counter (%d)\n", "invalid configuration (%d) for counter (%d)\n",
config, idx); config, idx);
local64_set(&event->prev_count, __core_reg_get(TXTACTCYC));
/* Reset the cycle count */
__core_reg_set(TXTACTCYC, 0);
goto unlock; goto unlock;
} }
@ -708,9 +706,8 @@ static u64 metag_pmu_read_counter(int idx)
{ {
u32 tmp = 0; u32 tmp = 0;
/* The act of reading the cycle counter also clears it */
if (METAG_INST_COUNTER == idx) { if (METAG_INST_COUNTER == idx) {
__core_reg_swap(TXTACTCYC, tmp); tmp = __core_reg_get(TXTACTCYC);
goto out; goto out;
} }