diff options
author | Will Deacon <will.deacon@arm.com> | 2013-08-20 11:47:42 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-14 12:15:57 +0100 |
commit | a73eb27dbbbbf1b3f40a4cec380f8d9f238c26aa (patch) | |
tree | bf6f6507435541f41cc6cf0c88343c9c3e9399b8 | |
parent | 0d7707cb914db6188e9041e4a4440687a3f89ddf (diff) | |
download | linux-linaro-stable-a73eb27dbbbbf1b3f40a4cec380f8d9f238c26aa.tar.gz |
arm64: perf: fix ARMv8 EVTYPE_MASK to include NSH bit
commit 178cd9ce377232518ec17ff2ecab2e80fa60784c upstream.
This is a port of f2fe09b055e2 ("ARM: 7663/1: perf: fix ARMv7 EVTYPE_MASK
to include NSH bit") to arm64, which fixes the broken evtype mask to
include the NSH bit, allowing profiling at EL2.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 0fe9a0dc92a64c088e76fcd3d35b2ba36b4d7f3c)
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | arch/arm64/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 2a1e9163d67a..cea1594ff933 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -784,7 +784,7 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] /* * PMXEVTYPER: Event selection reg */ -#define ARMV8_EVTYPE_MASK 0xc00000ff /* Mask for writable bits */ +#define ARMV8_EVTYPE_MASK 0xc80000ff /* Mask for writable bits */ #define ARMV8_EVTYPE_EVENT 0xff /* Mask for EVENT bits */ /* |