diff options
| author | Paul Mackerras <paulus@samba.org> | 2010-09-09 19:02:40 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-09-23 17:03:56 +1000 |
| commit | 9f5f9ffe50e90ed73040d2100db8bfc341cee352 (patch) | |
| tree | 779be5ca7519c1f1ce8e2082f325017f0d518cc4 /arch/powerpc | |
| parent | 1ef21199a5d98702755cfa0df39b8b5112c423d6 (diff) | |
| download | blackbird-obmc-linux-9f5f9ffe50e90ed73040d2100db8bfc341cee352.tar.gz blackbird-obmc-linux-9f5f9ffe50e90ed73040d2100db8bfc341cee352.zip | |
powerpc/perf: Fix sampling enable for PPC970
The logic to distinguish marked instruction events from ordinary events
on PPC970 and derivatives was flawed. The result is that instruction
sampling didn't get enabled in the PMU for some marked instruction
events, so they would never trigger. This fixes it by adding the
appropriate break statements in the switch statement.
Reported-by: David Binderman <dcb314@hotmail.com>
Cc: stable@kernel.org
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/ppc970-pmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/ppc970-pmu.c b/arch/powerpc/kernel/ppc970-pmu.c index 8eff48e20dba..3fee685de4df 100644 --- a/arch/powerpc/kernel/ppc970-pmu.c +++ b/arch/powerpc/kernel/ppc970-pmu.c @@ -169,9 +169,11 @@ static int p970_marked_instr_event(u64 event) switch (unit) { case PM_VPU: mask = 0x4c; /* byte 0 bits 2,3,6 */ + break; case PM_LSU0: /* byte 2 bits 0,2,3,4,6; all of byte 1 */ mask = 0x085dff00; + break; case PM_LSU1L: mask = 0x50 << 24; /* byte 3 bits 4,6 */ break; |
