Module Name: src
Committed By: jmcneill
Date: Sun Jun 16 10:57:59 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gtmr.c
Log Message:
Disable counter before updating cval/tval
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/sys/arch/arm/cortex/gtmr.c:1.40
--- src/sys/arch/arm/cortex/gtmr.c:1.39 Wed Jan 30 02:01:58 2019
+++ src/sys/arch/arm/cortex/gtmr.c Sun Jun 16 10:57:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.39 2019/01/30 02:01:58 jmcneill Exp $ */
+/* $NetBSD: gtmr.c,v 1.40 2019/06/16 10:57:59 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.39 2019/01/30 02:01:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.40 2019/06/16 10:57:59 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -268,6 +268,9 @@ gtmr_intr(void *arg)
if ((ctl & CNTCTL_ISTATUS) == 0)
return 0;
+ arm_isb();
+ gtmr_cntv_ctl_write(0);
+
const uint64_t now = gtmr_read_cntvct(sc);
uint64_t delta = now - ci->ci_lastintr;
@@ -299,12 +302,16 @@ gtmr_intr(void *arg)
delta = 0;
}
+ arm_isb();
if (ISSET(sc->sc_flags, GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER)) {
gtmr_cntv_cval_write(now + sc->sc_autoinc - delta);
} else {
gtmr_cntv_tval_write(sc->sc_autoinc - delta);
}
+ arm_isb();
+ gtmr_cntv_ctl_write(CNTCTL_ENABLE);
+
ci->ci_lastintr = now;
#ifdef DIAGNOSTIC
