ARM: dts: Fix timer regression for beagleboard revision c
Subsystems (3)
PATCH 1/1 ARM: dts: Fix timer regression for beagleboard revision c
Commit e428e250fde6 ("ARM: dts: Configure system timers for omap3") caused a timer regression for beagleboard revision c where the system clockevent stops working if omap3isp module is unloaded.
Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks applied that limit the usable timers for no good reason. This also affects the power management as we use the system clock instead of the 32k clock source.
Let's fix the issue by adding a new omap3-beagle-ab4.dts for the old timer quirks. This allows us to remove the timer quirks for later beagleboard revisions. We also need to update the related timer quirk check for the correct compatible property.
--- .../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
Documentation/devicetree/bindings/arm/omap/omap.txt +3 -0
@@ -119,6 +119,9 @@ Boards (incomplete list of examples): - OMAP3 BeagleBoard : Low cost community board compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3" +- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk + compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3" + - OMAP3 Tobi with Overo : Commercial expansion board with daughter board compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"
arch/arm/boot/dts/Makefile +1 -0
@@ -794,6 +794,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ logicpd-som-lv-37xx-devkit.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ + omap3-beagle-ab4.dtb \ omap3-beagle-xm.dtb \ omap3-beagle-xm-ab.dtb \ omap3-cm-t3517.dtb \
arch/arm/boot/dts/omap3-beagle-ab4.dts new file +47 -0
47 lines not on this page · raw message
arch/arm/boot/dts/omap3-beagle.dts +0 -33
@@ -308,39 +308,6 @@ &usbhsehci { phys = <0 &hsusb2_phy>; }; -/* Unusable as clocksource because of unreliable oscillator */ -&counter32k { - status = "disabled"; -}; - -/* Unusable as clockevent because if unreliable oscillator, allow to idle */ -&timer1_target { - /delete-property/ti,no-reset-on-init; - /delete-property/ti,no-idle; - timer@0 { - /delete-property/ti,timer-alwon; - }; -}; - -/* Preferred always-on timer for clocksource */ -&timer12_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - /* Always clocked by secure_32k_fck */ - }; -}; - -/* Preferred timer for clockevent */ -&timer2_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - assigned-clocks = <&gpt2_fck>; - assigned-clock-parents = <&sys_ck>; - }; -}; - &twl_gpio { ti,use-leds; /* pullups: BIT(1) */
drivers/clocksource/timer-ti-dm-systimer.c +1 -1
@@ -241,7 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void)bool quirk_unreliable_oscillator = false;/* Quirk unreliable 32 KiHz oscillator with incomplete dts */ -if (of_machine_is_compatible ("ti,omap3-beagle" ) || +if (of_machine_is_compatible ("ti,omap3-beagle-ab4" ) ||of_machine_is_compatible ("timll,omap3-devkit8000" )) { quirk_unreliable_oscillator = true; counter_32k = -ENODEV ;
Signature · 1 line
2.33.1
Quoted 21 lines · Tony Lindgren
Commit
e428e250fde6("ARM: dts: Configure system timers for omap3") caused a timer regression for beagleboard revision c where the system clockevent stops working if omap3isp module is unloaded.Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks applied that limit the usable timers for no good reason. This also affects the power management as we use the system clock instead of the 32k clock source.
Let's fix the issue by adding a new
omap3-beagle-ab4.dtsfor the old timer quirks. This allows us to remove the timer quirks for later beagleboard revisions. We also need to update the related timer quirk check for the correct compatible property.Fixes e428e250fde6 ("ARM: dts: Configure system timers for omap3")Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Rob Herring <[email protected]>Reported-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Quoted 9 lines
--- .../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
I trust Tony got this working since I lent the board for him to look at this regression since our earlier remote attempts didn't find a working fix.
Jarkko
Hi Tony,
Quoted 21 lines · Tony Lindgren
Commit
e428e250fde6("ARM: dts: Configure system timers for omap3") caused a timer regression for beagleboard revision c where the system clockevent stops working if omap3isp module is unloaded.Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks applied that limit the usable timers for no good reason. This also affects the power management as we use the system clock instead of the 32k clock source.
Let's fix the issue by adding a new
omap3-beagle-ab4.dtsfor the old timer quirks. This allows us to remove the timer quirks for later beagleboard revisions. We also need to update the related timer quirk check for the correct compatible property.Fixes e428e250fde6 ("ARM: dts: Configure system timers for omap3")Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Rob Herring <[email protected]>Reported-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Quoted 8 lines
--- .../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
Usually, bindings DT and driver changes are separate patches
Quoted 132 lines
Documentation/devicetree/bindings/arm/omap/omap.txt +3
-0@@ -119,6 +119,9 @@ Boards (incomplete list of examples): - OMAP3 BeagleBoard : Low cost community board compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3" +- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk + compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3" + - OMAP3 Tobi with Overo : Commercial expansion board with daughter board compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"arch/arm/boot/dts/Makefile +1
-0@@ -794,6 +794,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \ logicpd-som-lv-37xx-devkit.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ + omap3-beagle-ab4.dtb \ omap3-beagle-xm.dtb \ omap3-beagle-xm-ab.dtb \ omap3-cm-t3517.dtb \arch/arm/boot/dts/omap3-beagle-ab4.dts new file +47
-0@@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-only +/dts-v1/; + +#include "omap3-beagle.dts" + +/ { + model = "TI OMAP3 BeagleBoard A to B4"; + compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"; +}; + +/* + * Workaround for capacitor C70 issue, see "Boards revision A and < B5" + * section at https://elinux.org/BeagleBoard_Community + */ + +/* Unusable as clocksource because of unreliable oscillator */ +&counter32k { + status = "disabled"; +}; + +/* Unusable as clockevent because of unreliable oscillator, allow to idle */ +&timer1_target { + /delete-property/ti,no-reset-on-init; + /delete-property/ti,no-idle; + timer@0 { + /delete-property/ti,timer-alwon; + }; +}; + +/* Preferred always-on timer for clocksource */ +&timer12_target { + ti,no-reset-on-init; + ti,no-idle; + timer@0 { + /* Always clocked by secure_32k_fck */ + }; +}; + +/* Preferred timer for clockevent */ +&timer2_target { + ti,no-reset-on-init; + ti,no-idle; + timer@0 { + assigned-clocks = <&gpt2_fck>; + assigned-clock-parents = <&sys_ck>; + }; +};arch/arm/boot/dts/omap3-beagle.dts +0
-33@@ -308,39 +308,6 @@ &usbhsehci { phys = <0 &hsusb2_phy>; }; -/* Unusable as clocksource because of unreliable oscillator */ -&counter32k { - status = "disabled"; -}; - -/* Unusable as clockevent because if unreliable oscillator, allow to idle */ -&timer1_target { - /delete-property/ti,no-reset-on-init; - /delete-property/ti,no-idle; - timer@0 { - /delete-property/ti,timer-alwon; - }; -}; - -/* Preferred always-on timer for clocksource */ -&timer12_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - /* Always clocked by secure_32k_fck */ - }; -}; - -/* Preferred timer for clockevent */ -&timer2_target { - ti,no-reset-on-init; - ti,no-idle; - timer@0 { - assigned-clocks = <&gpt2_fck>; - assigned-clock-parents = <&sys_ck>; - }; -}; - &twl_gpio { ti,use-leds; /* pullups: BIT(1) */drivers/clocksource/timer-ti-dm-systimer.c +1
-1@@ -241,7 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void)bool quirk_unreliable_oscillator = false;/* Quirk unreliable 32 KiHz oscillator with incomplete dts */ -if (of_machine_is_compatible ("ti,omap3-beagle" ) || +if (of_machine_is_compatible ("ti,omap3-beagle-ab4" ) ||of_machine_is_compatible ("timll,omap3-devkit8000" )) { quirk_unreliable_oscillator = true; counter_32k = -ENODEV ;
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Hi,
Quoted 10 lines · Daniel Lezcano
Quoted 7 lines · Tony Lindgren
.../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dtsUsually, bindings DT and driver changes are separate patches
Not always for fixes :) In this case we need to patch both the dts for timer quirks, and also update the related driver quirk. The driver quirk I originally added to deal with possble older dtb files complicating the fix unncessarily..
If you have better ideas for a fix please let me know.
Regards,
Tony
Hi Tony
Quoted 23 lines · Tony Lindgren
Commit
e428e250fde6("ARM: dts: Configure system timers for omap3") caused a timer regression for beagleboard revision c where the system clockevent stops working if omap3isp module is unloaded.Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks applied that limit the usable timers for no good reason. This also affects the power management as we use the system clock instead of the 32k clock source.
Let's fix the issue by adding a new
omap3-beagle-ab4.dtsfor the old timer quirks. This allows us to remove the timer quirks for later beagleboard revisions. We also need to update the related timer quirk check for the correct compatible property.Fixes e428e250fde6 ("ARM: dts: Configure system timers for omap3")Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Rob Herring <[email protected]>Reported-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>---
Quoted 8 lines
.../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
I must have some error in my methodology since I cannot see the issue being fixed with your patch :-(
Testing at commit 6f513529296f ("Merge tag 'for-5.16-rc4-tag' ofgit://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux")
alias ma='nice make -j getconf _NPROCESSORS_ONLN ARCH=arm CROSS_COMPILE="ccache arm-linux-gnueabihf-"'
make ARCH=arm omap2plus_defconfig
ma
cat arch/arm/boot/dts/omap3-beagle.dtb >>arch/arm/boot/zImage ma LOADADDR=0x80008000 uImage
-> copy uImage & modules, boot
# rmmod omap3_isp # sleep 1 -> This is the regression. Sleep is blocked until I hit keys over serial console
rm vmlinux arch/arm/boot/zImage
patch -p1 </tmp/your-mail.eml
ma
cat arch/arm/boot/dts/omap3-beagle-ab4.dtb >>arch/arm/boot/zImage ma LOADADDR=0x80008000 uImage
-> copy uImage & modules to µSD, boot
# rmmod omap3_isp # sleep 1 -> is still blocked until I hit keys over serial console
When I compare the dmesg this is the only difference (along with "linux version" line) before user space starts. I.e. timer configuration is the same in both.
[ 0.000000] OF: fdt: Machine model: TI OMAP3 BeagleBoard -> [ 0.000000] OF: fdt: Machine model: TI OMAP3 BeagleBoard A to B4
Jarkko
Jarkko Nikula
Tested-byQuoted 34 lines · Jarkko Nikula
Hi Tony
Quoted 23 lines · Tony Lindgren
Commit
e428e250fde6("ARM: dts: Configure system timers for omap3") caused a timer regression for beagleboard revision c where the system clockevent stops working if omap3isp module is unloaded.Turns out we still have beagleboard revisions a-b4 capacitor c70 quirks applied that limit the usable timers for no good reason. This also affects the power management as we use the system clock instead of the 32k clock source.
Let's fix the issue by adding a new
omap3-beagle-ab4.dtsfor the old timer quirks. This allows us to remove the timer quirks for later beagleboard revisions. We also need to update the related timer quirk check for the correct compatible property.Fixes e428e250fde6 ("ARM: dts: Configure system timers for omap3")Cc Daniel Lezcano <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Rob Herring <[email protected]>Reported-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>---
Quoted 8 lines
.../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap3-beagle-ab4.dts | 47 +++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 33 ------------- drivers/clocksource/timer-ti-dm-systimer.c | 2 +- 5 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-beagle-ab4.dts
Quoted 3 lines
I must have some error in my methodology since I cannot see the issue being fixed with your patch :-(
Facepalm, as I was expecting I had error in my methodology... see below
Quoted 1 line
cat
arch/arm/boot/dts/omap3-beagle.dtb>>arch/arm/boot/zImage
This I used years before your patch and by some reason I confused to use new omap3-beagle-ab4.dtb when testing your patch yesterday:
Quoted 1 line
cat
arch/arm/boot/dts/omap3-beagle-ab4.dtb>>arch/arm/boot/zImage
without realizing my Beagle Board version is not between A to B4 but C2. So when using the omap3-beagle.dtb your patch fixes the regression I found.
Quoted 11 lines · Jarkko Nikula
On Sat, Dec 11, 2021 at 05:30:57PM +0200, Jarkko Nikula wrote:
This I used years before your patch and by some reason I confused to use new omap3-beagle-ab4.dtb when testing your patch yesterday:Quoted 1 line
cat
arch/arm/boot/dts/omap3-beagle-ab4.dtb>>arch/arm/boot/zImagewithout realizing my Beagle Board version is not between A to B4 but C2. So when using the omap3-beagle.dtb your patch fixes the regression I found.
Tested-by Jarkko Nikula <[email protected]>
OK good to hear omap3-beagle.dtb now works for beagles that don't have the A to B4 hardware timer issue :) And thanks for testing.
It seems the beagle revisions A to B4 are broken for any kind of power management as the clockevent timer for those boards is not always on. Probably not worth spending much effort on those. Maybe the PMIC could be reconfigured on the buggy revisions in addition to the timer quirks if somebody still cares for those board revisions.
Regards,
Tony
Quoted 13 lines · Tony Lindgren
Quoted 11 lines · Jarkko Nikula
On Sat, Dec 11, 2021 at 05:30:57PM +0200, Jarkko Nikula wrote:
This I used years before your patch and by some reason I confused to use new omap3-beagle-ab4.dtb when testing your patch yesterday:Quoted 1 line
cat
arch/arm/boot/dts/omap3-beagle-ab4.dtb>>arch/arm/boot/zImagewithout realizing my Beagle Board version is not between A to B4 but C2. So when using the omap3-beagle.dtb your patch fixes the regression I found.
Tested-by Jarkko Nikula <[email protected]>
Quoted 8 lines
OK good to hear omap3-beagle.dtb now works for beagles that don't have the A to B4 hardware timer issue :) And thanks for testing.
It seems the beagle revisions A to B4 are broken for any kind of power management as the clockevent timer for those boards is not always on. Probably not worth spending much effort on those. Maybe the PMIC could be reconfigured on the buggy revisions in addition to the timer quirks if somebody still cares for those board revisions.
Anyways, applying this fix into omap-for-v5.17/fixes-not-urgent.
Regards,
Tony