From: Jan Glauber Date: Thu, 18 Feb 2016 16:50:14 +0000 (+0100) Subject: arm64: perf: Extend event mask for ARMv8.1 X-Git-Tag: next-20160301~133^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c210ae8;p=karo-tx-linux.git 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 Signed-off-by: Will Deacon --- 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