arm64: perf: Extend event mask for ARMv8.1
authorJan Glauber <jglauber@cavium.com>
Thu, 18 Feb 2016 16:50:14 +0000 (17:50 +0100)
committerWill Deacon <will.deacon@arm.com>
Thu, 18 Feb 2016 17:23:41 +0000 (17:23 +0000)
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>
arch/arm64/kernel/perf_event.c

index 1cb61c9..1cc61fc 100644 (file)
@@ -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