Skip to content

Commit 1d63d1d

Browse files
ConchuODctmarinas
authored andcommitted
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: c2b2481 ("perf: starfive: Add StarLink PMU support") Fixes: f0dbc6d ("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>
1 parent 3fbd56f commit 1d63d1d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/perf/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ config RISCV_PMU_SBI
8787
filtering, counter configuration.
8888

8989
config STARFIVE_STARLINK_PMU
90-
depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
90+
depends on ARCH_STARFIVE || COMPILE_TEST
91+
depends on 64BIT
9192
bool "StarFive StarLink PMU"
9293
help
9394
Provide support for StarLink Performance Monitor Unit.

0 commit comments

Comments
 (0)