diff options
| author | Rob Herring (Arm) <robh@kernel.org> | 2024-07-31 10:51:23 -0600 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-08-16 13:09:12 +0100 |
| commit | 2f62701fa5b0ee94c68d2fcfc470d08aef195441 (patch) | |
| tree | 74f89e51693ffb230793e210dffaf612a0d0c99a /include/linux/perf | |
| parent | 126d7d7cce5e048fb82477a9842d088d10ff0df6 (diff) | |
| download | linux-stable-2f62701fa5b0ee94c68d2fcfc470d08aef195441.tar.gz linux-stable-2f62701fa5b0ee94c68d2fcfc470d08aef195441.tar.bz2 linux-stable-2f62701fa5b0ee94c68d2fcfc470d08aef195441.zip | |
KVM: arm64: Refine PMU defines for number of counters
There are 2 defines for the number of PMU counters:
ARMV8_PMU_MAX_COUNTERS and ARMPMU_MAX_HWEVENTS. Both are the same
currently, but Armv9.4/8.9 increases the number of possible counters
from 32 to 33. With this change, the maximum number of counters will
differ for KVM's PMU emulation which is PMUv3.4. Give KVM PMU emulation
its own define to decouple it from the rest of the kernel's number PMU
counters.
The VHE PMU code needs to match the PMU driver, so switch it to use
ARMPMU_MAX_HWEVENTS instead.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Tested-by: James Clark <james.clark@linaro.org>
Link: https://lore.kernel.org/r/20240731-arm-pmu-3-9-icntr-v3-6-280a8d7ff465@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'include/linux/perf')
| -rw-r--r-- | include/linux/perf/arm_pmuv3.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/perf/arm_pmuv3.h b/include/linux/perf/arm_pmuv3.h index f4ec76f725a3..4f7a7f2222e5 100644 --- a/include/linux/perf/arm_pmuv3.h +++ b/include/linux/perf/arm_pmuv3.h @@ -7,8 +7,6 @@ #define __PERF_ARM_PMUV3_H #define ARMV8_PMU_MAX_GENERAL_COUNTERS 31 -#define ARMV8_PMU_MAX_COUNTERS 32 - #define ARMV8_PMU_CYCLE_IDX 31 |