diff options
| author | Will Deacon <will@kernel.org> | 2022-03-08 16:33:34 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-08 16:33:34 +0300 |
| commit | 0162052214c7e850566ecef41003603c26667b5d (patch) | |
| tree | 4dc00397b33a616818518f41926c0dbfca4f0595 /drivers/perf/arm_pmu.c | |
| parent | f00f3674873bb4ca4984aa3c440f3b0087a3677e (diff) | |
| parent | a639027a1be1d68437e1c2cac6ed16306c84ab3c (diff) | |
| download | linux-0162052214c7e850566ecef41003603c26667b5d.tar.xz | |
Merge branch 'for-next/perf-m1' into for-next/perf
Support for the CPU PMUs on the Apple M1.
* for-next/perf-m1:
drivers/perf: Add Apple icestorm/firestorm CPU PMU driver
drivers/perf: arm_pmu: Handle 47 bit counters
irqchip/apple-aic: Move PMU-specific registers to their own include file
arm64: dts: apple: Add t8303 PMU nodes
arm64: dts: apple: Add t8103 PMU interrupt affinities
irqchip/apple-aic: Wire PMU interrupts
irqchip/apple-aic: Parse FIQ affinities from device-tree
dt-bindings: apple,aic: Add affinity description for per-cpu pseudo-interrupts
dt-bindings: apple,aic: Add CPU PMU per-cpu pseudo-interrupts
dt-bindings: arm-pmu: Document Apple PMU compatible strings
Diffstat (limited to 'drivers/perf/arm_pmu.c')
| -rw-r--r-- | drivers/perf/arm_pmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index a31b302b0ade..9694370651fa 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -109,6 +109,8 @@ static inline u64 arm_pmu_event_max_period(struct perf_event *event) { if (event->hw.flags & ARMPMU_EVT_64BIT) return GENMASK_ULL(63, 0); + else if (event->hw.flags & ARMPMU_EVT_47BIT) + return GENMASK_ULL(46, 0); else return GENMASK_ULL(31, 0); } |