[PATCH] clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic()

[Sami Tolvanen]

On Wed, Nov 17, 2021 at 3:35 AM Marc Zyngier <maz at kernel.org> wrote:
>
> With some specific kernel configuration and Clang, the kernel fails
> to like with something like:
>
> ld.lld: error: undefined symbol: __compiletime_assert_200
> >>> referenced by arch_timer.h:156 (./arch/arm64/include/asm/arch_timer.h:156)
> >>>               clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a
>
> ld.lld: error: undefined symbol: __compiletime_assert_197
> >>> referenced by arch_timer.h:133 (./arch/arm64/include/asm/arch_timer.h:133)
> >>>               clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a
> make: *** [Makefile:1161: vmlinux] Error 1
>
> These are due to the BUILD_BUG() macros contained in the low-level
> accessors (arch_timer_reg_{write,read}_cp15) being emitted, as the
> access type wasn't known at compile time.
>
> Fix this by making erratum_set_next_event_generic() __force_inline,
> resulting in the 'access' parameter to be resolved at compile time,
> similarly to what is already done for set_next_event().
>
> Fixes: 4775bc63f880 ("Add build-time guards for unhandled register accesses")
> Reported-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Signed-off-by: Marc Zyngier <maz at kernel.org>
> Cc: Mark Rutland <mark.rutland at arm.com>
> Cc: Daniel Lezcano <daniel.lezcano at linaro.org>
> Cc: Sami Tolvanen <samitolvanen at google.com>
> Cc: Nick Desaulniers <ndesaulniers at google.com>
> ---
>  drivers/clocksource/arm_arch_timer.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Thanks, Marc. I can confirm that this fixes the build issue for me.

Tested-by: Sami Tolvanen <samitolvanen at google.com>

Sami