pwm-omap-dmtimer regression fixes
Tony Lindgren
maintainercover pwm-omap-dmtimer regression fixes
Hi all,
The Pyra handheld PWM LCD regression in v5.0-rc1 reported by Nikolaus goes back to v4.19 for pwm-omap-dmtimer. Here are patches against v4.19 to fix the issue that also makes pwm-vibra working again for droid 4.
Regards,
Tony
Tony Lindgren (3):
clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
bus: ti-sysc: Fix timer handling with drop pm_runtime_irq_safe()
ARM: dts: Configure clock parent for pwm vibra
arch/arm/boot/dts/omap4-droid4-xt894.dts | 11 +++++++++++ drivers/bus/ti-sysc.c | 4 ++-- drivers/clocksource/timer-ti-dm.c | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-)
Signature · 1 line
2.20.1
Tony Lindgren
maintainerPATCH 1/3 clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
Commit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer where we now try to reparent the clock to itself with the following:
omap_dm_timer_of_set_source: failed to set parent
With ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents. So we should be able to remove omap_dm_timer_of_set_source with clean-up patches later on. But for now, let's just fix it first by checking if parent and fck are the same and bail out of so.
them with ti-sysc")
--- drivers/clocksource/timer-ti-dm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clocksource/timer-ti-dm.c +4 -0
@@ -154,6 +154,10 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer)if (IS_ERR (parent))return -ENODEV ; +/* Bail out if both clocks point to fck */ +if (clk_is_match (parent, timer->fclk)) +return 0 ; + ret =clk_set_parent (timer->fclk, parent);if (ret <0 )pr_err ("%s: failed to set parent\n" , __func__);
Signature · 1 line
2.20.1
Re: [PATCH 1/3] clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
Quoted 5 lines · On Tue, 22 Jan 2019 09:57:15 -0800 Tony Lindgren <[email protected]> wrote:
Commit
84badc5ec5fc("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer where we now try to reparent the clock to itself with the following:
Quoted 8 lines
omap_dm_timer_of_set_source: failed to set parentWith ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents. So we should be able to remove
omap_dm_timer_of_set_sourcewith clean-up patches later on. But for now, let's just fix it first by checking if parent and fck are the same and bail out of so.
together with 2/3 it fixes things on pyra
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
H. Nikolaus Schaller
Tested-byRe: [PATCH 1/3] clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
Quoted 19 lines
Am 26.01.2019 um 19:40 schrieb Andreas Kemnade <[email protected]>:
Quoted 5 lines · On Tue, 22 Jan 2019 09:57:15 -0800 Tony Lindgren <[email protected]> wrote:
Commit
84badc5ec5fc("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer where we now try to reparent the clock to itself with the following:Quoted 8 lines
omap_dm_timer_of_set_source: failed to set parentWith ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents. So we should be able to remove
omap_dm_timer_of_set_sourcewith clean-up patches later on. But for now, let's just fix it first by checking if parent and fck are the same and bail out of so.
Quoted 3 lines
together with 2/3 it fixes things on pyra
Tested-by Andreas Kemnade <[email protected]>
Re: [PATCH 1/3] clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
In reply to Tony LindgrenQuoted 27 lines · Tony Lindgren
Commit
84badc5ec5fc("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer where we now try to reparent the clock to itself with the following:
omap_dm_timer_of_set_source: failed to set parentWith ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents. So we should be able to remove
omap_dm_timer_of_set_sourcewith clean-up patches later on. But for now, let's just fix it first by checking if parent and fck are the same and bail out of so.Fixes 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probethem with ti-sysc")
Cc Bartosz Golaszewski <[email protected]>Cc Daniel Lezcano <[email protected]>Cc H. Nikolaus Schaller <[email protected]>Cc Keerthy <[email protected]>Cc Ladislav Michl <[email protected]>Cc Pavel Machek <[email protected]>Cc Sebastian Reichel <[email protected]>Cc Tero Kristo <[email protected]>Cc Thierry Reding <[email protected]>Cc Thomas Gleixner <[email protected]>Reported-by H. Nikolaus Schaller <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Quoted 1 line
---
Do you want me to take it through my tree (1 et 3)?
Quoted 18 lines
drivers/clocksource/timer-ti-dm.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/clocksource/timer-ti-dm.c +4
-0@@ -154,6 +154,10 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer)if (IS_ERR (parent))return -ENODEV ; +/* Bail out if both clocks point to fck */ +if (clk_is_match (parent, timer->fclk)) +return 0 ; + ret =clk_set_parent (timer->fclk, parent);if (ret <0 )pr_err ("%s: failed to set parent\n" , __func__);
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
Tony Lindgren
maintainerRe: [PATCH 1/3] clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
Hi,
Quoted 2 lines · Daniel Lezcano
Do you want me to take it through my tree (1 et 3)?
No need to thanks, I already sent a pull request on them as "[GIT PULL] omap soc regression fixes for v5.0-rc cycle" with you in Cc.
Regards,
Tony
Tony Lindgren
maintainerPATCH 2/3 bus: ti-sysc: Fix timer handling with drop pm_runtime_irq_safe()
In reply to Tony LindgrenCommit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") started producing a warning for pwm-omap-dmtimer:
WARNING: CPU: 0 PID: 77 at drivers/bus/omap_l3_noc.c:147 l3_interrupt_handler+0x2f8/0x388
44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4PER2 (Idle):
Data Access in Supervisor mode during Functional access
...__pm_runtime_idleomap_dm_timer_disablepwm_omap_dmtimer_startpwm_omap_dmtimer_enablepwm_apply_statepwm_vibrator_startpwm_vibrator_play_work
This is because the timer that pwm-omap-dmtimer is using is now being probed with ti-sysc interconnect target module instead of omap_device and the ti-sysc quirk for SYSC_QUIRK_LEGACY_IDLE is not fully compatible with what omap_device has been doing.
We could fix this by reverting the timer changes and have the timer probe again with omap_device. Or we could add more quirk handling to ti-sysc driver. But as these options don't work nicely as longer term solutions, let's just make timers probe with ti-sysc without any quirks.
To do this, all we need to do is remove quirks for timers for ti-sysc, and drop the bogus pm_runtime_irq_safe() flag for timer-ti-dm.
We should not use pm_runtime_irq_safe() anyways for drivers as it will take a permanent use count on the parent device blocking the parent devices from idling and has been forcing ti-sysc driver to use a quirk flag.
Note that we will move the timer data to DEBUG section later on in clean-up patches.
them with ti-sysc")
--- drivers/bus/ti-sysc.c | 4 ++-- drivers/clocksource/timer-ti-dm.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/bus/ti-sysc.c +2 -2
@@ -879,10 +879,10 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("smartreflex" ,0 ,-1 ,0x38 ,-1 ,0x00000000 ,0xffffffff ,SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("timer" ,0 ,0 ,0x10 ,0x14 ,0x00000015 ,0xffffffff , -SYSC_QUIRK_LEGACY_IDLE ), +0 ),/* Some timers on omap4 and later */ SYSC_QUIRK ("timer" ,0 ,0 ,0x10 ,-1 ,0x4fff1301 ,0xffffffff , -SYSC_QUIRK_LEGACY_IDLE ), +0 ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x00000052 ,0xffffffff , SYSC_QUIRK_LEGACY_IDLE),/* Uarts on omap4 and later */
drivers/clocksource/timer-ti-dm.c +0 -1
@@ -868,7 +868,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev) timer->pdev = pdev;pm_runtime_enable (dev); -pm_runtime_irq_safe (dev);if (!timer->reserved) { ret =pm_runtime_get_sync (dev);
Signature · 1 line
2.20.1
Re: [PATCH 2/3] bus: ti-sysc: Fix timer handling with drop pm_runtime_irq_safe()
Quoted 30 lines · On Tue, 22 Jan 2019 09:57:16 -0800 Tony Lindgren <[email protected]> wrote:
Commit
84badc5ec5fc("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") started producing a warning for pwm-omap-dmtimer:WARNING: CPU: 0 PID: 77 at drivers/bus/omap_l3_noc.c:147 l3_interrupt_handler+0x2f8/0x38844000000.ocp:L3 Custom Error: MASTER MPU TARGET L4PER2 (Idle):
Data Access in Supervisor mode during Functional access
...__pm_runtime_idleomap_dm_timer_disablepwm_omap_dmtimer_startpwm_omap_dmtimer_enablepwm_apply_statepwm_vibrator_startpwm_vibrator_play_workThis is because the timer that pwm-omap-dmtimer is using is now being probed with ti-sysc interconnect target module instead of
omap_deviceand the ti-sysc quirk forSYSC_QUIRK_LEGACY_IDLEis not fully compatible with whatomap_devicehas been doing.We could fix this by reverting the timer changes and have the timer probe again with
omap_device. Or we could add more quirk handling to ti-sysc driver. But as these options don't work nicely as longer term solutions, let's just make timers probe with ti-sysc without any quirks.To do this, all we need to do is remove quirks for timers for ti-sysc, and drop the bogus
pm_runtime_irq_safe()flag for timer-ti-dm.
Quoted 8 lines
We should not use
pm_runtime_irq_safe()anyways for drivers as it will take a permanent use count on the parent device blocking the parent devices from idling and has been forcing ti-sysc driver to use a quirk flag.Note that we will move the timer data to DEBUG section later on in clean-up patches.
together with 1/3 it fixes things on pyra.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/3] bus: ti-sysc: Fix timer handling with drop pm_runtime_irq_safe()
Quoted 41 lines
Am 26.01.2019 um 19:41 schrieb Andreas Kemnade <[email protected]>:
Quoted 35 lines · On Tue, 22 Jan 2019 09:57:16 -0800 Tony Lindgren <[email protected]> wrote:
Commit
84badc5ec5fc("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") started producing a warning for pwm-omap-dmtimer:WARNING: CPU: 0 PID: 77 at drivers/bus/omap_l3_noc.c:147 l3_interrupt_handler+0x2f8/0x38844000000.ocp:L3 Custom Error: MASTER MPU TARGET L4PER2 (Idle):
Data Access in Supervisor mode during Functional access
...__pm_runtime_idleomap_dm_timer_disablepwm_omap_dmtimer_startpwm_omap_dmtimer_enablepwm_apply_statepwm_vibrator_startpwm_vibrator_play_workThis is because the timer that pwm-omap-dmtimer is using is now being probed with ti-sysc interconnect target module instead of
omap_deviceand the ti-sysc quirk forSYSC_QUIRK_LEGACY_IDLEis not fully compatible with whatomap_devicehas been doing.We could fix this by reverting the timer changes and have the timer probe again with
omap_device. Or we could add more quirk handling to ti-sysc driver. But as these options don't work nicely as longer term solutions, let's just make timers probe with ti-sysc without any quirks.To do this, all we need to do is remove quirks for timers for ti-sysc, and drop the bogus
pm_runtime_irq_safe()flag for timer-ti-dm.We should not use
pm_runtime_irq_safe()anyways for drivers as it will take a permanent use count on the parent device blocking the parent devices from idling and has been forcing ti-sysc driver to use a quirk flag.
Quoted 6 lines
Quoted 3 lines
Note that we will move the timer data to DEBUG section later on in clean-up patches.
together with 1/3 it fixes things on pyra.
Tested-by Andreas Kemnade <[email protected]>
H. Nikolaus Schaller <[email protected]>
Tony Lindgren
maintainerPATCH 3/3 ARM: dts: Configure clock parent for pwm vibra
In reply to Tony LindgrenCommit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer for reparenting of the timer clock.
With ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents.
them with ti-sysc")
--- arch/arm/boot/dts/omap4-droid4-xt894.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/omap4-droid4-xt894.dts +11 -0
@@ -644,6 +644,17 @@ }; }; +/* Configure pwm clock source for timers 8 & 9 */ +&timer8 { + assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; + assigned-clock-parents = <&sys_clkin_ck>; +}; + +&timer9 { + assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; + assigned-clock-parents = <&sys_clkin_ck>; +}; + /* * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for * uart1 wakeirq.
Signature · 1 line
2.20.1