Skip to content

Commit

Permalink
metag: perf: fix core internal / perf channel mux
Browse files Browse the repository at this point in the history
The value written to the PERF_ICOREx or PERF_CHANx register to select
the performance events for the core internal and perf channel events was
(tmp & 0x0f), but tmp was set to (config & 0xf0) so it would always be
0. Correct it to use config instead of tmp.

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>
  • Loading branch information
James Hogan committed Mar 15, 2013
1 parent f6161aa commit 3424dab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/metag/kernel/perf/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
break;
}

metag_out32((tmp & 0x0f), perf_addr);
metag_out32((config & 0x0f), perf_addr);

/*
* Now we use the high nibble as the performance event to
Expand Down

0 comments on commit 3424dab

Please sign in to comment.