[PATCH 8/8] ACPI: arm64: Move PMU device registration to drivers/acpi/arm64/

From: Leo Yan

Date: Mon Nov 16 2026 - 13:23:27 EST


The ACPI PMU code now registers platform devices for the CPU PMU, SPE
and TRBE. Move it to drivers/acpi/arm64/pmu.c with the other Arm ACPI
device enumeration code.

Move its Kconfig entry alongside it and rename the hidden ARM_PMU_ACPI
symbol to ACPI_PMU. Drop the ARM_PMU dependency: enumeration does not
use the CPU PMU framework, and each device type is guarded by its driver
configuration. This allows SPE and TRBE enumeration with ARM_PMU disabled.

Keep the default-y setting, update the build guard and retain PMU
maintainer coverage for the new path.

Signed-off-by: Leo Yan <leo.yan@xxxxxxx>
---
MAINTAINERS | 1 +
drivers/acpi/arm64/Kconfig | 4 ++++
drivers/acpi/arm64/Makefile | 1 +
drivers/{perf/arm_pmu_acpi.c => acpi/arm64/pmu.c} | 0
drivers/perf/Kconfig | 4 ----
drivers/perf/Makefile | 1 -
6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index ccbcdc0799b9fb8cc2b4dc139906e1584e096c46..f12a37cf20e13583c949b6fa7d9f5eb08e260566 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2445,6 +2445,7 @@ F: arch/arm*/include/asm/hw_breakpoint.h
F: arch/arm*/include/asm/perf_event.h
F: arch/arm*/kernel/hw_breakpoint.c
F: arch/arm*/kernel/perf_*
+F: drivers/acpi/arm64/pmu.c
F: drivers/perf/
F: include/linux/perf/arm_pmu*.h

diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig
index f2fd79f22e7d836b07401eb055725b2632ba624c..b4dd7f4d257e005b32d34012169ac595dcdee468 100644
--- a/drivers/acpi/arm64/Kconfig
+++ b/drivers/acpi/arm64/Kconfig
@@ -24,3 +24,7 @@ config ACPI_APMT

config ACPI_MPAM
bool
+
+config ACPI_PMU
+ depends on ACPI
+ def_bool y
diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile
index 9390b57cb56481c547ebb896c58cf3e37a980827..f09e4506954d897caa44481a83f81ca65cfb7d96 100644
--- a/drivers/acpi/arm64/Makefile
+++ b/drivers/acpi/arm64/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_ACPI_FFH) += ffh.o
obj-$(CONFIG_ACPI_GTDT) += gtdt.o
obj-$(CONFIG_ACPI_IORT) += iort.o
obj-$(CONFIG_ACPI_MPAM) += mpam.o
+obj-$(CONFIG_ACPI_PMU) += pmu.o
obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.o
obj-$(CONFIG_ARM_AMBA) += amba.o
obj-y += dma.o init.o
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/acpi/arm64/pmu.c
similarity index 100%
rename from drivers/perf/arm_pmu_acpi.c
rename to drivers/acpi/arm64/pmu.c
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index 245e7bb763b9947afc0330689b15d1b73d567f25..e9d61d5dbd1f174cc3862cf7f7823896df9d07d6 100644
--- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig
@@ -129,10 +129,6 @@ config ANDES_CUSTOM_PMU

If you don't know what to do here, say "Y".

-config ARM_PMU_ACPI
- depends on ARM_PMU && ACPI
- def_bool y
-
config ARM_SMMU_V3_PMU
tristate "ARM SMMUv3 Performance Monitors Extension"
depends on ARM64 || (COMPILE_TEST && 64BIT)
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
index eb8a022dad9a7a78433d42e9424c632d187debea..ddbae5f627ad8bcbe9d7e6c29293429562d85037 100644
--- a/drivers/perf/Makefile
+++ b/drivers/perf/Makefile
@@ -5,7 +5,6 @@ obj-$(CONFIG_ARM_CMN) += arm-cmn.o
obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o
obj-$(CONFIG_ARM_NI) += arm-ni.o
obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
-obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
obj-$(CONFIG_ARM_PMUV3) += arm_pmuv3.o
obj-$(CONFIG_ARM_V6_PMU) += arm_v6_pmu.o
obj-$(CONFIG_ARM_V7_PMU) += arm_v7_pmu.o

--
2.34.1