diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-08-08 16:58:33 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-08-08 17:12:34 +0100 |
| commit | 6c833bb9247ed51028279ef7b82ebbbe60d789e3 (patch) | |
| tree | f465e7a2151a31657057cfbbb71409920ae47db4 /drivers/perf | |
| parent | c1be2ddb1e25ecf425d93a81dc64a650b9ff3107 (diff) | |
| download | lwn-6c833bb9247ed51028279ef7b82ebbbe60d789e3.tar.gz lwn-6c833bb9247ed51028279ef7b82ebbbe60d789e3.zip | |
arm64: perf: Allow standard PMUv3 events to be extended by the CPU type
Rather than continue adding CPU-specific event maps, instead look up by
default in the PMUv3 event map and only fallback to the CPU-specific maps
if either the event isn't described by PMUv3, or it is described but
the PMCEID registers say that it is unsupported by the current CPU.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf')
| -rw-r--r-- | drivers/perf/arm_pmu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 1c5e0f333779..d14fc2e67f93 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -47,6 +47,9 @@ armpmu_map_cache_event(const unsigned (*cache_map) if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX) return -EINVAL; + if (!cache_map) + return -ENOENT; + ret = (int)(*cache_map)[cache_type][cache_op][cache_result]; if (ret == CACHE_OP_UNSUPPORTED) @@ -63,6 +66,9 @@ armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config) if (config >= PERF_COUNT_HW_MAX) return -EINVAL; + if (!event_map) + return -ENOENT; + mapping = (*event_map)[config]; return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping; } |