d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear timer interrupt status before calling callback, not after it,

Browse Source 
This fixes timer interrupt losses, fatal in one-shot mode.
This commit is contained in:
mav 2010-09-18 13:44:39 +00:00
parent b9d3291981
commit 7066648caf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arm/mv/timer.c
View File

@ -178,14 +178,14 @@ mv_hardclock(void *arg)
struct mv_timer_softc *sc; struct mv_timer_softc *sc;
uint32_t irq_cause; 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 = read_cpu_ctrl(BRIDGE_IRQ_CAUSE);
irq_cause &= ~(IRQ_TIMER0); irq_cause &= ~(IRQ_TIMER0);
write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause); 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); return (FILTER_HANDLED);
} }
@ -394,6 +394,8 @@ mv_timer_start(struct eventtimer *et,
val |= CPU_TIMER0_EN; val |= CPU_TIMER0_EN;
if (period != NULL) if (period != NULL)
val |= CPU_TIMER0_AUTO; val |= CPU_TIMER0_AUTO;
else
val &= ~CPU_TIMER0_AUTO;
mv_set_timer_control(val); mv_set_timer_control(val);
return (0); return (0);
} }