ARM: omap2: drop broken broadcast timer hack
Subsystems (3)
PATCH 1/1 ARM: omap2: drop broken broadcast timer hack
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'
--- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/timer.c | 6 ------ 2 files changed, 7 deletions(-)
arch/arm/mach-omap2/Kconfig +0 -1
@@ -67,7 +67,6 @@ config SOC_AM43XX select ARM_GIC select MACH_OMAP_GENERIC select HAVE_ARM_SCU - select GENERIC_CLOCKEVENTS_BROADCAST select HAVE_ARM_TWD select ARM_ERRATA_754322 select ARM_ERRATA_775420
arch/arm/mach-omap2/timer.c +0 -6
@@ -46,12 +46,6 @@ void set_cntfreq(void)omap_smc1 (OMAP5_DRA7_MON_SET_CNTFRQ_INDEX , arch_timer_freq); } -#if !defined(CONFIG_SMP ) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST ) -void tick_broadcast (const struct cpumask *mask) -{ -} -#endif -#if defined(CONFIG_SOC_OMAP5 ) || defined(CONFIG_SOC_DRA7XX )/*
Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tony Lindgren
maintainerQuoted 6 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'
Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
I've probably removed something accidentally to cause this.
Regards,
Tony
Quoted 44 lines
Fixes 2ee04b88547a ("ARM: OMAP2+: Drop old timer code for dmtimer and 32k counter")Signed-off-by Arnd Bergmann <[email protected]>--- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/timer.c | 6 ------ 2 files changed, 7 deletions(-)arch/arm/mach-omap2/Kconfig +0
-1@@ -67,7 +67,6 @@ config SOC_AM43XX select ARM_GIC select MACH_OMAP_GENERIC select HAVE_ARM_SCU - select GENERIC_CLOCKEVENTS_BROADCAST select HAVE_ARM_TWD select ARM_ERRATA_754322 select ARM_ERRATA_775420arch/arm/mach-omap2/timer.c +0
-6@@ -46,12 +46,6 @@ void set_cntfreq(void)omap_smc1 (OMAP5_DRA7_MON_SET_CNTFRQ_INDEX , arch_timer_freq); } -#if !defined(CONFIG_SMP ) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST ) -void tick_broadcast (const struct cpumask *mask) -{ -} -#endif -#if defined(CONFIG_SOC_OMAP5 ) || defined(CONFIG_SOC_DRA7XX )/* Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tony Lindgren
maintainerQuoted 5 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
Quoted 7 lines
Quoted 2 lines
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
I've probably removed something accidentally to cause this.
Sounds like arch/arm/mach-omap2/Makefile change needs to be removed to always still build in timer.o. And probably timer.c needs back the ifdef for CONFIG_SOC_HAS_REALTIME_COUNTER.
I'll take a look today.
Regards,
Tony
Tony Lindgren
maintainerQuoted 12 lines · Tony Lindgren
Quoted 11 lines · Tony Lindgren
Quoted 6 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
Quoted 7 lines
Quoted 1 line
I've probably removed something accidentally to cause this.
Sounds like
arch/arm/mach-omap2/Makefilechange needs to be removed to always still build in timer.o. And probablytimer.cneeds back the ifdef forCONFIG_SOC_HAS_REALTIME_COUNTER.I'll take a look today.
I've sent a patch along those lines as:
[PATCH] ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs
A link for the patch at [0] below.
Regards,
Tony
[0] https://lore.kernel.org/linux-omap/[email protected]/T/#u
Quoted 19 lines · Tony Lindgren
Quoted 18 lines · Tony Lindgren
Quoted 5 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
Quoted 7 lines
Quoted 2 lines
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
I've probably removed something accidentally to cause this.
Sounds like
arch/arm/mach-omap2/Makefilechange needs to be removed to always still build in timer.o. And probablytimer.cneeds back the ifdef forCONFIG_SOC_HAS_REALTIME_COUNTER.
Quoted 8 lines
Quoted 1 line
I'll take a look today.
I've sent a patch along those lines as:
[PATCH] ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs
A link for the patch at [0] below.
CPU local timers not being in always ON power domain use to be the reason on early version of the SOCs but later SOC moved the CPU local timer also in always on domain. Probably AM43xx does loose local timer on CPU PD in low power so yes broadcast would be needed with dmtimer help.
Quoted 3 lines
[0] https://lore.kernel.org/linux-omap/[email protected]/T/#u
This should restore it.
Regards,
Santosh
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 35 lines · On Thu, May 28, 2020 at 6:18 PM <[email protected]> wrote:
Quoted 19 lines · Tony Lindgren
Quoted 18 lines · Tony Lindgren
Quoted 5 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
Quoted 7 lines
Quoted 2 lines
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
I've probably removed something accidentally to cause this.
Sounds like
arch/arm/mach-omap2/Makefilechange needs to be removed to always still build in timer.o. And probablytimer.cneeds back the ifdef forCONFIG_SOC_HAS_REALTIME_COUNTER.Quoted 8 lines
Quoted 1 line
I'll take a look today.
I've sent a patch along those lines as:
[PATCH] ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs
A link for the patch at [0] below.
CPU local timers not being in always ON power domain use to be the reason on early version of the SOCs but later SOC moved the CPU local timer also in always on domain. Probably AM43xx does loose local timer on CPU PD in low power so yes broadcast would be needed with dmtimer help.
Quoted 1 line
Quoted 3 lines
Quoted 2 lines
[0] https://lore.kernel.org/linux-omap/[email protected]/T/#u
This should restore it.
Should I apply the fix directly to the arm/soc branch that has the other changes then?
Arnd
Tony Lindgren
maintainerQuoted 36 lines · Arnd Bergmann
Quoted 35 lines · On Thu, May 28, 2020 at 6:18 PM <[email protected]> wrote:
Quoted 19 lines · Tony Lindgren
Quoted 18 lines · Tony Lindgren
Quoted 5 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann
The OMAP4 timer code had a special hack for using the broadcast timer without SMP. Since the dmtimer is now gone, this also needs to be dropped to avoid a link failure for non-SMP AM43xx configurations:
Quoted 7 lines
Quoted 2 lines
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'Hmm this sounds like a regression though. Isn't this needed for using the ARM local timers on non-SMP SoC, so a separate timer from dmtimer?
I've probably removed something accidentally to cause this.
Sounds like
arch/arm/mach-omap2/Makefilechange needs to be removed to always still build in timer.o. And probablytimer.cneeds back the ifdef forCONFIG_SOC_HAS_REALTIME_COUNTER.Quoted 8 lines
Quoted 1 line
I'll take a look today.
I've sent a patch along those lines as:
[PATCH] ARM: OMAP2+: Fix regression for using local timer on non-SMP SoCs
A link for the patch at [0] below.
CPU local timers not being in always ON power domain use to be the reason on early version of the SOCs but later SOC moved the CPU local timer also in always on domain. Probably AM43xx does loose local timer on CPU PD in low power so yes broadcast would be needed with dmtimer help.
Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
[0] https://lore.kernel.org/linux-omap/[email protected]/T/#u
This should restore it.
Should I apply the fix directly to the arm/soc branch that has the other changes then?
Sure please do, that saves a single-fix pull request.
Regards,
Tony