The arm_arch_timer requires that VDSO_CLOCKMODE_ARCHTIMER to be
defined to compile correctly. On arm the vDSO can be disabled and when
this is the case the compilation ends prematurely with an error:
$ make ARCH=arm multi_v7_defconfig
$ ./scripts/config -d VDSO
$ make
drivers/clocksource/arm_arch_timer.c:73:44: error:
‘VDSO_CLOCKMODE_ARCHTIMER’ undeclared here (not in a function)
static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER;
^
scripts/Makefile.build:267: recipe for target
'drivers/clocksource/arm_arch_timer.o' failed
make[2]: *** [drivers/clocksource/arm_arch_timer.o] Error 1
make[2]: *** Waiting for unfinished jobs....
scripts/Makefile.build:505: recipe for target 'drivers/clocksource' failed
make[1]: *** [drivers/clocksource] Error 2
make[1]: *** Waiting for unfinished jobs....
Makefile:1683: recipe for target 'drivers' failed
make: *** [drivers] Error 2
This patch series addresses the issue defining a default arch clockmode
for arm and arm64 and using it to initialize the arm_arch_timer.
Changes:
--------
v2:
- Addressed Marc Zyngier comments.
- Rebased on 5.6-rc2.
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Marc Zyngier <maz@xxxxxxxxxx>
Cc: Mark Rutland <Mark.Rutland@xxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Vincenzo Frascino (3):
arm: clocksource: Add VDSO default clockmode
arm64: clocksource: Add VDSO default clockmode
clocksource: Fix arm_arch_timer clockmode when vDSO disabled
arch/arm/Kconfig | 1 +
arch/arm/include/asm/clocksource.h | 10 ++++++++++
arch/arm64/include/asm/clocksource.h | 1 +
drivers/clocksource/arm_arch_timer.c | 2 +-
4 files changed, 13 insertions(+), 1 deletion(-)
--
2.25.0
