Skip to contentSkip to conversation

pnx8550: fix system timer support

PATCH In review Vitaly Wool 3 participants 3 messages Dec 21, 2006 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pnx8550: fix system timer support

Hello Ralf,

the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then.

 arch/mips/kernel/time.c                 |    2 -
 arch/mips/philips/pnx8550/common/time.c |   38 ++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)
arch/mips/kernel/time.c +0 -2
index 11aab6d..5fe3eb8 100644
@@ -94,10 +94,8 @@ static void c0_timer_ack(void)
 {
 	unsigned int count;
 
-#ifndef CONFIG_SOC_PNX8550	/* pnx8550 resets to zero */
 	/* Ack this timer interrupt and set the next one.  */
 	expirelo += cycles_per_jiffy;
-#endif
 	write_c0_compare(expirelo);
 
 	/* Check to see if we have missed any timer interrupts.  */
arch/mips/philips/pnx8550/common/time.c +36 -2
index 65c440e..25a8df7 100644
@@ -29,12 +29,27 @@
 #include <asm/hardirq.h>
 #include <asm/div64.h>
 #include <asm/debug.h>
+#include <asm/time.h>
 
 #include <int.h>
 #include <cm.h>
 
 extern unsigned int mips_hpt_frequency;
 
+static unsigned long cpj;
+
+static cycle_t hpt_read(void)
+{
+	return read_c0_count2();
+}
+
+static void timer_ack(void)
+{
+	write_c0_compare(cpj);
+}
+
+extern struct clocksource clocksource_mips;
+
 /*
  * pnx8550_time_init() - it does the following things:
  *
@@ -68,22 +83,41 @@ void pnx8550_time_init(void)
 	 * HZ timer interrupts per second.
 	 */
 	mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));
+	cpj = (mips_hpt_frequency + HZ / 2) / HZ;
+	timer_ack();
+
+	clocksource_mips.read = hpt_read;
+	mips_timer_ack = timer_ack;
+}
+
+static irqreturn_t monotonic_interrupt(int irq, void *dev_id)
+{
+	/* Timer 2 clear interrupt */
+	write_c0_compare2(-1);
+	return IRQ_HANDLED;
 }
 
+static struct irqaction monotonic_irqaction = {
+	.handler = monotonic_interrupt,
+	.flags = IRQF_DISABLED,
+	.name = "Monotonic timer",
+};
+
 void __init plat_timer_setup(struct irqaction *irq)
 {
 	int configPR;
 
 	setup_irq(PNX8550_INT_TIMER1, irq);
+	setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
 
 	/* Start timer1 */
 	configPR = read_c0_config7();
 	configPR &= ~0x00000008;
 	write_c0_config7(configPR);
 
-	/* Timer 2 stop */
+	/* Timer 2 start */
 	configPR = read_c0_config7();
-	configPR |= 0x00000010;
+	configPR &= ~0x00000010;
 	write_c0_config7(configPR);
 
 	write_c0_count2(0);
#1 lore raw
Quoted 3 lines · Vitaly Wool

the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then.

...

Quoted 1 line

This patch obsoletes my patch posted 2 days ago. Daniel, please ignore mine and try this.

arch/mips/philips/pnx8550/common/time.c line 37

Quoted 12 lines
arch/mips/philips/pnx8550/common/time.c +1 -0
@@ -29,12 +29,27 @@
 #include <asm/hardirq.h>
 #include <asm/div64.h>
 #include <asm/debug.h>
+#include <asm/time.h>
 
 #include <int.h>
 #include <cm.h>
 
 extern unsigned int mips_hpt_frequency;

Minor comment. The asm/time.h is already included, isn't it? And mips_hpt_frequency is declared in asm/time.h so the "external" line can be removed.

---
Atsushi Nemoto

#2 lore raw
In reply to Vitaly Wool

Hello.

Quoted 24 lines · Vitaly Wool

the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then.

arch/mips/kernel/time.c +0 -2
index 11aab6d..5fe3eb8 100644
@@ -94,10 +94,8 @@ static void c0_timer_ack(void)
 {
 	unsigned int count;
 
-#ifndef CONFIG_SOC_PNX8550	/* pnx8550 resets to zero */
 	/* Ack this timer interrupt and set the next one.  */
 	expirelo += cycles_per_jiffy;
-#endif
 	write_c0_compare(expirelo);
 
 	/* Check to see if we have missed any timer interrupts.  */
arch/mips/philips/pnx8550/common/time.c +0 -0
index 65c440e..25a8df7 100644

arch/mips/philips/pnx8550/common/time.c line 37

Quoted 9 lines
arch/mips/philips/pnx8550/common/time.c +1 -0
@@ -29,12 +29,27 @@
 #include <asm/hardirq.h>
 #include <asm/div64.h>
 #include <asm/debug.h>
+#include <asm/time.h>
 
 #include <int.h>
 #include <cm.h>
 
 extern unsigned int mips_hpt_frequency;

This is already declared in <asm/time.h>...

arch/mips/philips/pnx8550/common/time.c line 51

Quoted 13 lines
arch/mips/philips/pnx8550/common/time.c +13 -0
+static unsigned long cpj;
+
+static cycle_t hpt_read(void)
+{
+	return read_c0_count2();
+}
+
+static void timer_ack(void)
+{
+	write_c0_compare(cpj);
+}
+
+extern struct clocksource clocksource_mips;

And this too...

arch/mips/philips/pnx8550/common/time.c void pnx8550_time_init(void) · line 87

Quoted 6 lines
arch/mips/philips/pnx8550/common/time.c +2 -0
@@ -68,22 +83,41 @@ void pnx8550_time_init(void)
 	 * HZ timer interrupts per second.
 	 */
 	mips_hpt_frequency = 27UL * ((1000000UL * n)/(m * pow2p));
+	cpj = (mips_hpt_frequency + HZ / 2) / HZ;
+	timer_ack();

Probably makes sense to clear Count2 as well...

Quoted 8 lines
arch/mips/philips/pnx8550/common/time.c +1 -0
 void __init plat_timer_setup(struct irqaction *irq)
 {
 	int configPR;
 
 	setup_irq(PNX8550_INT_TIMER1, irq);
+	setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
 
 	/* Start timer1 */

arch/mips/philips/pnx8550/common/time.c void pnx8550_time_init(void) · line 121

Quoted 10 lines
arch/mips/philips/pnx8550/common/time.c +2 -2
 	configPR = read_c0_config7();
 	configPR &= ~0x00000008;
 	write_c0_config7(configPR);
 
-	/* Timer 2 stop */
+	/* Timer 2 start */
 	configPR = read_c0_config7();
-	configPR |= 0x00000010;
+	configPR &= ~0x00000010;
 	write_c0_config7(configPR);

I'd have coalesced that into one RMW but well...

arch/mips/philips/pnx8550/common/time.c void pnx8550_time_init(void) · line 123

Quoted 1 line
arch/mips/philips/pnx8550/common/time.c +0 -0
 	write_c0_count2(0);

WBR, Sergei