[PATCH] arm: fix versatile boot hang (seen with qemu)

[john stultz]

Hey Russell,

	I have been having troubles getting the 2.6.35 kernel to boot in my
qemu-system-arm environment. It worked with 2.6.34, and so I bisected it
down to:
	commit e388771458b4ff3ad81ab70e390b24d069647da4
	Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
	Date:   Thu Jan 14 13:30:16 2010 +0000
	ARM: Realview/Versatile: separate out common SP804 timer code

The issue seems to be that the common sp804_set_mode function was not
identical to the ones it replaced. It added an extra writel and did not
write zero out on shutdown.

The following patch resolves the issue for me and gets things booting.

Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>

diff --git a/arch/arm/plat-versatile/timer-sp.c b/arch/arm/plat-versatile/timer-sp.c
index 98722f4..6d7fff4 100644
--- a/arch/arm/plat-versatile/timer-sp.c
+++ b/arch/arm/plat-versatile/timer-sp.c
@@ -102,8 +102,6 @@ static void sp804_set_mode(enum clock_event_mode mode,
 {
 	unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE;
 
-	writel(ctrl, clkevt_base + TIMER_CTRL);
-
 	switch (mode) {
 	case CLOCK_EVT_MODE_PERIODIC:
 		writel(TIMER_RELOAD, clkevt_base + TIMER_LOAD);
@@ -118,7 +116,7 @@ static void sp804_set_mode(enum clock_event_mode mode,
 	case CLOCK_EVT_MODE_UNUSED:
 	case CLOCK_EVT_MODE_SHUTDOWN:
 	default:
-		break;
+		ctrl = 0;
 	}
 
 	writel(ctrl, clkevt_base + TIMER_CTRL);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/