diff options
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/kernel/perf_event.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index cea1594ff933..5d14470452ac 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c | |||
@@ -784,8 +784,8 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] | |||
784 | /* | 784 | /* |
785 | * PMXEVTYPER: Event selection reg | 785 | * PMXEVTYPER: Event selection reg |
786 | */ | 786 | */ |
787 | #define ARMV8_EVTYPE_MASK 0xc80000ff /* Mask for writable bits */ | 787 | #define ARMV8_EVTYPE_MASK 0xc80003ff /* Mask for writable bits */ |
788 | #define ARMV8_EVTYPE_EVENT 0xff /* Mask for EVENT bits */ | 788 | #define ARMV8_EVTYPE_EVENT 0x3ff /* Mask for EVENT bits */ |
789 | 789 | ||
790 | /* | 790 | /* |
791 | * Event filters for PMUv3 | 791 | * Event filters for PMUv3 |
@@ -1175,7 +1175,8 @@ static void armv8pmu_reset(void *info) | |||
1175 | static int armv8_pmuv3_map_event(struct perf_event *event) | 1175 | static int armv8_pmuv3_map_event(struct perf_event *event) |
1176 | { | 1176 | { |
1177 | return map_cpu_event(event, &armv8_pmuv3_perf_map, | 1177 | return map_cpu_event(event, &armv8_pmuv3_perf_map, |
1178 | &armv8_pmuv3_perf_cache_map, 0xFF); | 1178 | &armv8_pmuv3_perf_cache_map, |
1179 | ARMV8_EVTYPE_EVENT); | ||
1179 | } | 1180 | } |
1180 | 1181 | ||
1181 | static struct arm_pmu armv8pmu = { | 1182 | static struct arm_pmu armv8pmu = { |