diff options
author | Will Deacon <will@kernel.org> | 2022-03-08 14:33:34 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2022-03-08 14:33:34 +0100 |
commit | 0162052214c7e850566ecef41003603c26667b5d (patch) | |
tree | 4dc00397b33a616818518f41926c0dbfca4f0595 /drivers/perf/Kconfig | |
parent | arm64: perf: Consistently make all event numbers as 16-bits (diff) | |
parent | drivers/perf: Add Apple icestorm/firestorm CPU PMU driver (diff) | |
download | linux-0162052214c7e850566ecef41003603c26667b5d.tar.xz linux-0162052214c7e850566ecef41003603c26667b5d.zip |
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/Kconfig')
-rw-r--r-- | drivers/perf/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig index b9deef6ed423..d05ca6ebbb9d 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -146,6 +146,13 @@ config MARVELL_CN10K_TAD_PMU Provides support for Last-Level cache Tag-and-data Units (LLC-TAD) performance monitors on CN10K family silicons. +config APPLE_M1_CPU_PMU + bool "Apple M1 CPU PMU support" + depends on ARM_PMU && ARCH_APPLE + help + Provides support for the non-architectural CPU PMUs present on + the Apple M1 SoCs and derivatives. + source "drivers/perf/hisilicon/Kconfig" config MARVELL_CN10K_DDR_PMU |