Module Name: src
Committed By: matt
Date: Sun Apr 12 17:08:25 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: gtmr.c
Log Message:
Don't adjust interval if we are too far into the next tick.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/cortex/gtmr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.14 src/sys/arch/arm/cortex/gtmr.c:1.15
--- src/sys/arch/arm/cortex/gtmr.c:1.14 Fri Mar 27 11:12:08 2015
+++ src/sys/arch/arm/cortex/gtmr.c Sun Apr 12 17:08:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.14 2015/03/27 11:12:08 skrll Exp $ */
+/* $NetBSD: gtmr.c,v 1.15 2015/04/12 17:08:25 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.14 2015/03/27 11:12:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.15 2015/04/12 17:08:25 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -306,12 +306,13 @@ gtmr_intr(void *arg)
ci->ci_data.cpu_name, delta, sc->sc_autoinc);
/*
- * If we got interrupted too soon (delta < sc->sc_autoinc) or
- * we missed a tick (delta >= 2 * sc->sc_autoinc), don't try to
- * adjust for jitter.
+ * If we got interrupted too soon (delta < sc->sc_autoinc)
+ * or we missed (or almost missed) a tick
+ * (delta >= 7 * sc->sc_autoinc / 4), don't try to adjust for jitter.
*/
- delta -= sc->sc_autoinc;
- if (delta >= sc->sc_autoinc) {
+ if (delta >= sc->sc_autoinc && delta <= 7 * sc->sc_autoinc / 4) {
+ delta -= sc->sc_autoinc;
+ } else {
delta = 0;
}
armreg_cntv_tval_write(sc->sc_autoinc - delta);
