summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorJan Glauber <jglauber@cavium.com>2016-02-18 17:50:14 +0100
committerWill Deacon <will.deacon@arm.com>2016-02-18 17:23:41 +0000
commitc210ae80e4e7083e03bee13535d11fc2c991cf71 (patch)
treef2a04f5176c779d6f034d825233ea5aba8c4425a /arch/arm64/kernel
parent7175f0591eb9714fa71d499c59c35bcbd030931a (diff)
downloadlinux-c210ae80e4e7083e03bee13535d11fc2c991cf71.tar.gz
linux-c210ae80e4e7083e03bee13535d11fc2c991cf71.tar.bz2
linux-c210ae80e4e7083e03bee13535d11fc2c991cf71.zip
arm64: perf: Extend event mask for ARMv8.1
ARMv8.1 increases the PMU event number space to 16 bit so increase the EVTYPE mask. Signed-off-by: Jan Glauber <jglauber@cavium.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/perf_event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 1cb61c9fbb21..1cc61fc321d9 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -419,8 +419,8 @@ static const struct attribute_group *armv8_pmuv3_attr_groups[] = {
/*
* PMXEVTYPER: Event selection reg
*/
-#define ARMV8_EVTYPE_MASK 0xc80003ff /* Mask for writable bits */
-#define ARMV8_EVTYPE_EVENT 0x3ff /* Mask for EVENT bits */
+#define ARMV8_EVTYPE_MASK 0xc800ffff /* Mask for writable bits */
+#define ARMV8_EVTYPE_EVENT 0xffff /* Mask for EVENT bits */
/*
* Event filters for PMUv3