svn commit: r212823 - head/sys/arm/mv

Alexander Motin mav at FreeBSD.org
Sat Sep 18 13:44:40 UTC 2010


Author: mav
Date: Sat Sep 18 13:44:39 2010
New Revision: 212823
URL: http://svn.freebsd.org/changeset/base/212823

Log:
  Clear timer interrupt status before calling callback, not after it,
  This fixes timer interrupt losses, fatal in one-shot mode.

Modified:
  head/sys/arm/mv/timer.c

Modified: head/sys/arm/mv/timer.c
==============================================================================
--- head/sys/arm/mv/timer.c	Sat Sep 18 11:18:42 2010	(r212822)
+++ head/sys/arm/mv/timer.c	Sat Sep 18 13:44:39 2010	(r212823)
@@ -178,14 +178,14 @@ mv_hardclock(void *arg)
 	struct	mv_timer_softc *sc;
 	uint32_t irq_cause;
 
-	sc = (struct mv_timer_softc *)arg;
-	if (sc->et.et_active)
-		sc->et.et_event_cb(&sc->et, sc->et.et_arg);
-
 	irq_cause = read_cpu_ctrl(BRIDGE_IRQ_CAUSE);
 	irq_cause &= ~(IRQ_TIMER0);
 	write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause);
 
+	sc = (struct mv_timer_softc *)arg;
+	if (sc->et.et_active)
+		sc->et.et_event_cb(&sc->et, sc->et.et_arg);
+
 	return (FILTER_HANDLED);
 }
 
@@ -394,6 +394,8 @@ mv_timer_start(struct eventtimer *et,
 	val |= CPU_TIMER0_EN;
 	if (period != NULL)
 		val |= CPU_TIMER0_AUTO;
+	else
+		val &= ~CPU_TIMER0_AUTO;
 	mv_set_timer_control(val);
 	return (0);
 }


More information about the svn-src-head mailing list