| Message ID | 20200224151552.57274-1-vincenzo.frascino@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | a67de48b3075cbb6ec030205d7b78981def6596d |
| Headers | show |
| Series | [v3] clocksource: Fix arm_arch_timer clockmode when vDSO disabled | expand |
Hi, On 24.02.2020 16:15, Vincenzo Frascino wrote: > 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 > > Define VDSO_CLOCKMODE_ARCHTIMER as VDSO_CLOCKMODE_NONE when the vDSOs are > not enabled to address the issue. > > Fixes: 5e3c6a312a09 ("ARM/arm64: vdso: Use common vdso clock mode storage") > Cc: Marc Zyngier <maz@kernel.org> > Cc: Mark Rutland <Mark.Rutland@arm.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: Thomas Gleixner <tglx@linutronix.de> > Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > drivers/clocksource/arm_arch_timer.c | 4 ++++ > 1 file changed, 4 insertions(+) > > This patch has been rebased and tested on tip/timers/core. > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index ee2420d56f67..d53f4c7ccaae 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -69,7 +69,11 @@ static enum arch_timer_ppi_nr arch_timer_uses_ppi = ARCH_TIMER_VIRT_PPI; > static bool arch_timer_c3stop; > static bool arch_timer_mem_use_virtual; > static bool arch_counter_suspend_stop; > +#ifdef CONFIG_GENERIC_GETTIMEOFDAY > static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER; > +#else > +static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_NONE; > +#endif /* CONFIG_GENERIC_GETTIMEOFDAY */ > > static cpumask_t evtstrm_available = CPU_MASK_NONE; > static bool evtstrm_enable = IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM); Best regards
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index ee2420d56f67..d53f4c7ccaae 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -69,7 +69,11 @@ static enum arch_timer_ppi_nr arch_timer_uses_ppi = ARCH_TIMER_VIRT_PPI; static bool arch_timer_c3stop; static bool arch_timer_mem_use_virtual; static bool arch_counter_suspend_stop; +#ifdef CONFIG_GENERIC_GETTIMEOFDAY static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER; +#else +static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_NONE; +#endif /* CONFIG_GENERIC_GETTIMEOFDAY */ static cpumask_t evtstrm_available = CPU_MASK_NONE; static bool evtstrm_enable = IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM);
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 Define VDSO_CLOCKMODE_ARCHTIMER as VDSO_CLOCKMODE_NONE when the vDSOs are not enabled to address the issue. Fixes: 5e3c6a312a09 ("ARM/arm64: vdso: Use common vdso clock mode storage") Cc: Marc Zyngier <maz@kernel.org> Cc: Mark Rutland <Mark.Rutland@arm.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- drivers/clocksource/arm_arch_timer.c | 4 ++++ 1 file changed, 4 insertions(+) This patch has been rebased and tested on tip/timers/core.