| From 178cd9ce377232518ec17ff2ecab2e80fa60784c Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will.deacon@arm.com> |
| Date: Tue, 20 Aug 2013 11:47:42 +0100 |
| Subject: arm64: perf: fix ARMv8 EVTYPE_MASK to include NSH bit |
| |
| From: Will Deacon <will.deacon@arm.com> |
| |
| 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> |
| |
| --- |
| arch/arm64/kernel/perf_event.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm64/kernel/perf_event.c |
| +++ b/arch/arm64/kernel/perf_event.c |
| @@ -784,7 +784,7 @@ static const unsigned armv8_pmuv3_perf_c |
| /* |
| * 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 */ |
| |
| /* |
