diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-28 17:49:11 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-20 15:03:21 +0000 |
| commit | 3e6f87330536fcbc887ccabb30887096f6ce5c0a (patch) | |
| tree | f4fb66e4bf89441c8be809366adb331e9ca3ec38 | |
| parent | 0149797bb6d01648df71fed72b88591c75bca5a5 (diff) | |
| download | linux-stable-3e6f87330536fcbc887ccabb30887096f6ce5c0a.tar.gz linux-stable-3e6f87330536fcbc887ccabb30887096f6ce5c0a.tar.bz2 linux-stable-3e6f87330536fcbc887ccabb30887096f6ce5c0a.zip | |
ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK to include NSH bit
commit f2fe09b055e2549de41fb107b34c60bac4a1b0cf upstream.
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.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | arch/arm/kernel/perf_event_v7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index 104931924c8b..510456d8c34e 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c @@ -720,7 +720,7 @@ static const unsigned armv7_a15_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 */ /* |