Skip to content

Commit

Permalink
ARM: 7355/1: perf: clear overflow flag when disabling counter on ARMv…
Browse files Browse the repository at this point in the history
…7 PMU

When disabling a counter on an ARMv7 PMU, we should also clear the
overflow flag in case an overflow occurred whilst stopping the counter.
This prevents a spurious overflow being picked up later and leading to
either false accounting or a NULL dereference.

Cc: <stable@vger.kernel.org>
Reported-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
wildea01 authored and Russell King committed Mar 7, 2012
1 parent 5727347 commit 99c1745
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/kernel/perf_event_v7.c
Expand Up @@ -809,6 +809,11 @@ static inline int armv7_pmnc_disable_intens(int idx)

counter = ARMV7_IDX_TO_COUNTER(idx);
asm volatile("mcr p15, 0, %0, c9, c14, 2" : : "r" (BIT(counter)));
isb();
/* Clear the overflow flag in case an interrupt is pending. */
asm volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (BIT(counter)));
isb();

return idx;
}

Expand Down

0 comments on commit 99c1745

Please sign in to comment.