Skip to contentSkip to conversation

ARM: integrator: deactivate timer0 on the Integrator/CP

PATCH New Linus Walleij 2 participants 5 messages Oct 7, 2013 – Oct 13, 2013 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: integrator: deactivate timer0 on the Integrator/CP

This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init"

When this code was introduced, the both aliases pointing the system to use timer1 as primary (clocksource) and timer2 as secondary (clockevent) was ignored, and the system would simply use the first two timers found as clocksource and clockevent.

However this made the system timeline accelerate by a factor x25, as it turns out that the way the clocking actually works (totally undocumented and found after some trial-and-error) is that timer0 runs @ 25MHz and timer1 and timer2 runs @ 1MHz. Presumably this divider setting is a boot-on default and configurable albeit the way to configure it is not documented.

So as a quick fix to the problem, let's mark timer0 as disabled, so the code will chose timer1 and timer2 as it used to.

This also deletes the two aliases for the primary and secondary timer as they have been superceded by the auto-selection

Cc stable at vger.kernel.org
Cc Rob Herring <[email protected]>
Cc Russell King <[email protected]>

---
ARM SoC folks: can you please apply this directly for fixes if noone complains? Thanks.

---
 arch/arm/boot/dts/integratorcp.dts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/integratorcp.dts +4 -5
index ff1aea0..72693a6 100644
@@ -9,11 +9,6 @@
 	model = "ARM Integrator/CP";
 	compatible = "arm,integrator-cp";
 
-	aliases {
-		arm,timer-primary = &timer2;
-		arm,timer-secondary = &timer1;
-	};
-
 	chosen {
 		bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
 	};
@@ -24,14 +19,18 @@
 	};
 
 	timer0: timer at 13000000 {
+		/* TIMER0 runs @ 25MHz */
 		compatible = "arm,integrator-cp-timer";
+		status = "disabled";
 	};
 
 	timer1: timer at 13000100 {
+		/* TIMER1 runs @ 1MHz */
 		compatible = "arm,integrator-cp-timer";
 	};
 
 	timer2: timer at 13000200 {
+		/* TIMER2 runs @ 1MHz */
 		compatible = "arm,integrator-cp-timer";
 	};
 
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 ARM: integrator: deactivate timer0 on the Integrator/CP

Quoted 26 lines · Linus Walleij

This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init"

When this code was introduced, the both aliases pointing the system to use timer1 as primary (clocksource) and timer2 as secondary (clockevent) was ignored, and the system would simply use the first two timers found as clocksource and clockevent.

However this made the system timeline accelerate by a factor x25, as it turns out that the way the clocking actually works (totally undocumented and found after some trial-and-error) is that timer0 runs @ 25MHz and timer1 and timer2 runs @ 1MHz. Presumably this divider setting is a boot-on default and configurable albeit the way to configure it is not documented.

So as a quick fix to the problem, let's mark timer0 as disabled, so the code will chose timer1 and timer2 as it used to.

This also deletes the two aliases for the primary and secondary timer as they have been superceded by the auto-selection

Quoted 7 lines
Cc stable at vger.kernel.org
Cc Rob Herring <[email protected]>
Cc Russell King <[email protected]>

---
ARM SoC folks: can you please apply this directly for fixes if noone complains? Thanks.

Certainly, but I'll give them a day or two to complain. Prod me if I haven't applied by Wednesday (and there has been no further discussion).

-Olof

#2 lore raw

PATCH 1/1 ARM: integrator: deactivate timer0 on the Integrator/CP

Quoted 5 lines · Olof Johansson
Quoted 3 lines · Linus Walleij

This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init"

(...)

Quoted 6 lines
Quoted 3 lines

---
ARM SoC folks: can you please apply this directly for fixes if noone complains? Thanks.

Certainly, but I'll give them a day or two to complain. Prod me if I haven't applied by Wednesday (and there has been no further discussion).

Plonk!

Yours,
Linus Walleij

#3 lore raw

PATCH 1/1 ARM: integrator: deactivate timer0 on the Integrator/CP

Quoted 7 lines · Linus Walleij
Quoted 5 lines · Olof Johansson
Quoted 3 lines · Linus Walleij

This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init"

(...)

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

---
ARM SoC folks: can you please apply this directly for fixes if noone complains? Thanks.

Certainly, but I'll give them a day or two to complain. Prod me if I haven't applied by Wednesday (and there has been no further discussion).

Plonk!

Bleep Bleep! Regression!

Yours,
Linus Walleij

#4 lore raw

PATCH 1/1 ARM: integrator: deactivate timer0 on the Integrator/CP

Quoted 12 lines · Linus Walleij
Quoted 11 lines · Linus Walleij
Quoted 5 lines · Olof Johansson
Quoted 3 lines · Linus Walleij

This fixes a long-standing Integrator/CP regression from commit 870e2928cf3368ca9b06bc925d0027b0a56bcd8e "ARM: integrator-cp: convert use CLKSRC_OF for timer init"

(...)

Quoted 4 lines
Quoted 3 lines

---
ARM SoC folks: can you please apply this directly for fixes if noone complains? Thanks.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Certainly, but I'll give them a day or two to complain. Prod me if I haven't applied by Wednesday (and there has been no further discussion).

Plonk!

Bleep Bleep! Regression!

I was searching for the one patch that I couldn't remember about when I sent the series today. This was it. Whoops.

I've applied this to fixes now, and it'll be part of the next pull request sometime next week. Sorry for the delay.

-Olof