[openwrt/openwrt] config: add ARM PMUv3 for kernel 6.6

LEDE Commits lede-commits at lists.infradead.org
Tue May 14 04:24:00 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/4341901f050058aba0f908c775a4d136c311062c

commit 4341901f050058aba0f908c775a4d136c311062c
Author: Robert Marko <robimarko at gmail.com>
AuthorDate: Sun May 12 21:18:19 2024 +0200

    config: add ARM PMUv3 for kernel 6.6
    
    Kernel 6.6 has moved the ARM PMUv3 driver to drivers/perf and now once
    KERNEL_ARM_PMU is selected trying to build the kernel will stop with:
    ARM PMUv3 support (ARM_PMUV3) [N/y/?] (NEW)
    
    So, lets enable ARM_PMUV3 for ARMv7 and ARMv8 architectures if
    KERNEL_PERF_EVENTS is selected.
    
    Fixes: #15466
    Link: https://github.com/openwrt/openwrt/pull/15469
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 config/Config-kernel.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index feabf0870e..0acd320504 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -50,6 +50,11 @@ config KERNEL_ARM_PMU
 	default y if TARGET_armsr_armv8
 	depends on (arm || aarch64)
 
+config KERNEL_ARM_PMUV3
+	bool
+	default y if TARGET_armsr_armv8
+	depends on (arm_v7 || aarch64) && LINUX_6_6
+
 config KERNEL_RISCV_PMU
 	bool
 	select KERNEL_RISCV_PMU_SBI
@@ -79,6 +84,7 @@ config KERNEL_X86_VSYSCALL_EMULATION
 config KERNEL_PERF_EVENTS
 	bool "Compile the kernel with performance events and counters"
 	select KERNEL_ARM_PMU if (arm || aarch64)
+	select KERNEL_ARM_PMUV3 if (arm_v7 || aarch64) && LINUX_6_6
 	select KERNEL_RISCV_PMU if riscv64
 
 config KERNEL_PROFILING




More information about the lede-commits mailing list