arm64: perf: Extend event mask for ARMv8.1

BugLink: http://bugs.launchpad.net/bugs/1559349
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>
(cherry picked from linux-next commit c210ae80e4e7083e03bee13535d11fc2c991cf71)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index dc24856052414e33a0d2b7e12ce242a6388c7704..0abe721faa7a4354992ee5040345d2bb88bdd3bf 100644 (file)
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -418,8 +418,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