Skip to contentSkip to conversation

i386 HPET code

PATCH In review Pallipadi, Venkatesh 6 participants 12 messages Feb 3, 2005 – Feb 6, 2005

lore
Share & tools
lore
#0 lore raw

Hi John, Andrew,

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 3 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Thanks,
Venki

Quoted 82 lines

-----Original Message-----
From: john stultz [mailto:[email protected]]
Sent: Wednesday, February 02, 2005 6:05 PM
To: Pallipadi, Venkatesh
Cc: Andi Kleen; lkml; keith maanthey; Max Asbock; Chris McDermott
Subject: i386 HPET code

Hey Venkatesh,
I've been looking into a bug where i386 2.6 kernels do
not boot on IBM
e325s if HPET_TIMER is enabled (hpet=disable works around the issue). When running x86-64 kernels, the issue isn't seen. It appears that after
the hpet is enabled, we stop receiving timer ticks. I've not played on any other HPET enabled systems, nor have I looked at the HPET spec, so I'm not sure if this is a hardware issue or not.

The following patch, which uses the x86-64 code for hpet_timer_stop_set_go() seems to fix the issue.

Your thoughts?

thanks
-john

===== arch/i386/kernel/time_hpet.c 1.10 vs edited =====

arch/i386/kernel/time_hpet.c +0 -0

17:59:27 -08:00

arch/i386/kernel/time_hpet.c +18 -17
@@ -64,29 +64,30 @@
 {
 	unsigned int cfg;
 
-	/*
-	 * Stop the timers and reset the main counter.
-	 */
+/*
+ * Stop the timers and reset the main counter.
+ */
+
 	cfg = hpet_readl(HPET_CFG);
-	cfg &= ~HPET_CFG_ENABLE;
+	cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);
 	hpet_writel(cfg, HPET_CFG);
 	hpet_writel(0, HPET_COUNTER);
 	hpet_writel(0, HPET_COUNTER + 4);
 
-	/*
-	 * Set up timer 0, as periodic with first interrupt to happen at
-	 * hpet_tick, and period also hpet_tick.
-	 */
-	cfg = hpet_readl(HPET_T0_CFG);
-	cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
-	       HPET_TN_SETVAL | HPET_TN_32BIT;
-	hpet_writel(cfg, HPET_T0_CFG);
-	hpet_writel(tick, HPET_T0_CMP);
+/*
+ * Set up timer 0, as periodic with first interrupt to happen 
 at hpet_tick,
+ * and period also hpet_tick.
+ */
+
+	hpet_writel(HPET_TN_ENABLE | HPET_TN_PERIODIC | HPET_TN_SETVAL |
+		    HPET_TN_32BIT, HPET_T0_CFG);
+	hpet_writel(hpet_tick, HPET_T0_CMP);
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */
+
+/*
+ * Go!
+ */
 
-	/*
- 	 * Go!
- 	 */
-	cfg = hpet_readl(HPET_CFG);
 	cfg |= HPET_CFG_ENABLE | HPET_CFG_LEGACY;
 	hpet_writel(cfg, HPET_CFG);
#1 lore raw
Quoted 6 lines · Venkatesh

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 3 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Yep. Adding only the second write seems to make the box boot.

Since this isn't just affecting our hardware (see Andrew Walrond's comment in the thread), would doing two writes like x86-64 does be acceptable?

thanks
-john

#2 lore raw
Quoted 10 lines · john stultz
Quoted 6 lines · Venkatesh

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 3 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Yep. Adding only the second write seems to make the box boot.

Quoted 4 lines

Since this isn't just affecting our hardware (see Andrew Walrond's comment in the thread), would doing two writes like x86-64 does be acceptable?

Yes. As this is just the initialization code, I think adding second write is OK. But, I am not sure why two writes are required and will the two write be sufficient for all systems. I don't seem to remember anything about this in HPET specs. I will double check it.

Basically I am thinking of something like this will be a good generic solution in place of simple two writes.

for (i = 0 ; i <some number for max retries>; i++) {
	hpet_writel(hpet_tick, HPET_T0_CMP);
	if (hpet_tick == hpet_readl(hpet_tick, HPET_T0_CMP))
		break;
}

I think we can wait for result from Andrew's system and chose either one of the above approaches.

Thanks,
Venki

#3 lore raw
Quoted 8 lines

Basically I am thinking of something like this will be a good generic solution in place of simple two writes.

for (i = 0 ; i <some number for max retries>; i++) {
	hpet_writel(hpet_tick, HPET_T0_CMP);
	if (hpet_tick == hpet_readl(hpet_tick, HPET_T0_CMP))
		break;
}

Makes sense. There were so many bugs in PIT timer access over time, it would be probably a miracle if the hardware engineers got all the HPET implementations right ;-)

If you do a fix like this please change x86-64 too.

-Andi

#4 lore raw
In reply to Venkatesh Pallipadi
Quoted 10 lines · Venkatesh Pallipadi
Quoted 9 lines · john stultz
Quoted 5 lines · Venkatesh

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Quoted 2 lines

hpet_writel(hpet_tick, HPET_T0_CMP);
+ hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Yep. Adding only the second write seems to make the box boot.

Just to confirm that this also fixes the problem for two types of MSI dual opteron motherboards. (MSI K8D Master 2/3)

Andrew Walrond

#5 lore raw
In reply to Pallipadi, Venkatesh
Quoted 9 lines · Venkatesh

Hi John, Andrew,

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 2 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Ask Vojtech (cced), he wrote the x86-64 HPET code.

-Andi

#6 lore raw
Quoted 5 lines · Andi Kleen
Quoted 4 lines · Venkatesh

Hi John, Andrew,

Quoted 8 lines
Quoted 5 lines

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 2 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Ask Vojtech (cced), he wrote the x86-64 HPET code.

Can you add some background of the thread?

Signature · 2 lines
Vojtech Pavlik
SuSE Labs, SuSE CR
#7 lore raw
In reply to Andi Kleen
Quoted 5 lines · Andi Kleen
Quoted 4 lines · Venkatesh

Hi John, Andrew,

Quoted 8 lines
Quoted 5 lines

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 2 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Ask Vojtech (cced), he wrote the x86-64 HPET code.

It took me a while to remember, but:

The first write after writing TN_SETVAL to the config register sets the counter value, the second write sets the threshold.

When you only do the first write you never set the threshold and interrupts won't be generated properly.

Signature · 2 lines
Vojtech Pavlik
SuSE Labs, SuSE CR
#8 lore raw
Quoted 15 lines · Vojtech Pavlik
Quoted 5 lines · Andi Kleen
Quoted 4 lines · Venkatesh

Hi John, Andrew,

Quoted 8 lines
Quoted 5 lines

Can you check whether only the following change makes the problem go away. If yes, then it looks like a hardware issue.

Review

Quoted 2 lines
	hpet_writel(hpet_tick, HPET_T0_CMP);
(quoted diff) +1 -0
+	hpet_writel(hpet_tick, HPET_T0_CMP); /* AK: why twice? */

Ask Vojtech (cced), he wrote the x86-64 HPET code.

Quoted 7 lines

It took me a while to remember, but:

The first write after writing TN_SETVAL to the config register sets the counter value, the second write sets the threshold.

When you only do the first write you never set the threshold and interrupts won't be generated properly.

That means it's not a bug, but a (documented) feature.

Signature · 2 lines
Vojtech Pavlik
SuSE Labs, SuSE CR
#9 lore raw

PATCH 1/1 HPET setup, duplicate HPET_T0_CMP needed for some platforms

In reply to Vojtech Pavlik

This patch fixes the issue with HPET on some platforms.

According to Vojtech Pavlik:

The first write after writing TN_SETVAL to the config register sets the counter value, the second write sets the threshold.

When you only do the first write you never set the threshold and interrupts won't be generated properly.

Thanks to John Stultz and Andrew Walrond for reporting, root causing the issue and verifying this fix.

arch/i386/kernel/time_hpet.c renamed from arch/i386/kernel/time_hpet.c.org +5 -0
@@ -81,6 +81,11 @@ static int hpet_timer_stop_set_go(unsign
 	cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
 	       HPET_TN_SETVAL | HPET_TN_32BIT;
 	hpet_writel(cfg, HPET_T0_CFG);
+	/* 
+	 * Some systems seems to need two writes to HPET_T0_CMP, 
+	 * to get interrupts working
+	 */
+	hpet_writel(tick, HPET_T0_CMP);
 	hpet_writel(tick, HPET_T0_CMP);
 
 	/*
#10 lore raw

Re: [PATCH][i386] HPET setup, duplicate HPET_T0_CMP needed for some platforms

arch/i386/kernel/time_hpet.c static int hpet_timer_stop_set_go(unsign · line 87

Quoted 4 lines · Venkatesh Pallipadi

+ /*

arch/i386/kernel/time_hpet.c renamed from arch/i386/kernel/time_hpet.c.org +3 -0
+  * Some systems seems to need two writes to HPET_T0_CMP,
+  * to get interrupts working
+  */

I think you should update this comment in light of the information from Vojtech:

/*
* The first write after writing TN_SETVAL to the config register sets the
* counter value, the second write sets the threshold.
*/

Andrew Walrond

#11 lore raw

Re: [PATCH][i386] HPET setup, duplicate HPET_T0_CMP needed for some platforms

In reply to Venkatesh Pallipadi

arch/i386/kernel/time_hpet.c static int hpet_timer_stop_set_go(unsign · line 89

Quoted 6 lines · Venkatesh Pallipadi
arch/i386/kernel/time_hpet.c renamed from arch/i386/kernel/time_hpet.c.org +5 -0
+	/* 
+	 * Some systems seems to need two writes to HPET_T0_CMP, 
+	 * to get interrupts working
+	 */
+	hpet_writel(tick, HPET_T0_CMP);
 	hpet_writel(tick, HPET_T0_CMP);

Is it known which platforms require two, and which ones require one write? Is it cost-effective to #if CONFIG_ the second write?

Signature · 7 lines
Giuseppe "Oblomov" Bilotta

Can't you see
It all makes perfect sense
Expressed in dollar and cents
Pounds shillings and pence
                  (Roger Waters)