aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConor Dooley <conor.dooley@microchip.com>2024-03-18 15:35:04 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2024-03-19 19:01:39 +0000
commit1d63d1d9e5c5cb2e7c7ca75751a5eaf67c5623a7 (patch)
tree02a0833815cbfd24dee5991fc14cfae38cac5b77
parent3fbd56f0e7c14e7c7a7597fd4a368753fe70d76f (diff)
downloadlinux-1d63d1d9e5c5cb2e7c7ca75751a5eaf67c5623a7.tar.gz
perf: starfive: fix 64-bit only COMPILE_TEST condition
ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's addition of a 64-bit only condition satisfied the build robots doing COMPILE_TEST builds, Palmer ran into the same problems with writeq() being undefined during regular rv32 builds. Promote the dependency on 64-bit to its own `depends on` so that the driver can never be included in 32-bit builds. Reported-by: Palmer Dabbelt <palmer@rivosinc.com> Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support") Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for 64-bit architectures") Signed-off-by: Conor Dooley <conor.dooley@microchip.com> Acked-by: Will Deacon <will@kernel.org> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> Acked-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> Link: https://lore.kernel.org/r/20240318-emphatic-rally-f177a4fe1bdc@spud Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--drivers/perf/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index 004d86230aa630..54ff5cc17ccdb4 100644
--- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig
@@ -87,7 +87,8 @@ config RISCV_PMU_SBI
filtering, counter configuration.
config STARFIVE_STARLINK_PMU
- depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
+ depends on ARCH_STARFIVE || COMPILE_TEST
+ depends on 64BIT
bool "StarFive StarLink PMU"
help
Provide support for StarLink Performance Monitor Unit.