Commit f2fe09b0 authored Feb 28, 2013 by Will Deacon Committed by Russell King Mar 03, 2013

ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bit



Masked out PMXEVTYPER.NSH means that we can't enable profiling at PL2,
regardless of the settings in the HDCR.

This patch fixes the broken mask.

Cc: <stable@vger.kernel.org>
Reported-by: Christoffer Dall <cdall@cs.columbia.edu>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 1a8e6118

arch/arm/kernel/perf_event_v7.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -774,7 +774,7 @@ static const unsigned armv7_a7_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
		/*
		* PMXEVTYPER: Event selection reg
		*/
		#define ARMV7_EVTYPE_MASK 0xc00000ff /* Mask for writable bits */
		#define ARMV7_EVTYPE_MASK 0xc80000ff /* Mask for writable bits */
		#define ARMV7_EVTYPE_EVENT 0xff /* Mask for EVENT bits */

		/*