Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/cortex A64 timer errata can cause the timer to ...



details:   https://anonhg.NetBSD.org/src/rev/33e9c29bc71d
branches:  trunk
changeset: 445874:33e9c29bc71d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Nov 15 17:15:52 2018 +0000

description:
A64 timer errata can cause the timer to fire too soon, so skip KASSERT here too.

diffstat:

 sys/arch/arm/cortex/gtmr.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r ed26a3f2e7a0 -r 33e9c29bc71d sys/arch/arm/cortex/gtmr.c
--- a/sys/arch/arm/cortex/gtmr.c        Thu Nov 15 16:58:56 2018 +0000
+++ b/sys/arch/arm/cortex/gtmr.c        Thu Nov 15 17:15:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gtmr.c,v 1.37 2018/10/30 10:38:11 jmcneill Exp $       */
+/*     $NetBSD: gtmr.c,v 1.38 2018/11/15 17:15:52 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.37 2018/10/30 10:38:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.38 2018/11/15 17:15:52 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -282,9 +282,11 @@
        }
 #endif
 
-       KASSERTMSG(delta > sc->sc_autoinc / 100,
-           "%s: interrupting too quickly (delta=%"PRIu64") autoinc=%lu",
-           ci->ci_data.cpu_name, delta, sc->sc_autoinc);
+       if (!ISSET(sc->sc_flags, GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER)) {
+               KASSERTMSG(delta > sc->sc_autoinc / 100,
+                   "%s: interrupting too quickly (delta=%"PRIu64") autoinc=%lu",
+                   ci->ci_data.cpu_name, delta, sc->sc_autoinc);
+       }
 
        /*
         * If we got interrupted too soon (delta < sc->sc_autoinc)



Home | Main Index | Thread Index | Old Index