[src/netbsd-8]: src/sys/arch/arm/cortex Pull up following revision(s) (reques...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b7a470d3045
branches:  netbsd-8
changeset: 434297:2b7a470d3045
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Sep 11 05:25:20 2017 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #271):
        sys/arch/arm/cortex/gtmr.c: revision 1.20
gtmr_intr: If the ISTATUS bit is 0, timer condition is not met. In this
case, just return 0.

diffstat:

 sys/arch/arm/cortex/gtmr.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 4542f6f635ce -r 2b7a470d3045 sys/arch/arm/cortex/gtmr.c
--- a/sys/arch/arm/cortex/gtmr.c        Mon Sep 11 05:24:16 2017 +0000
+++ b/sys/arch/arm/cortex/gtmr.c        Mon Sep 11 05:25:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gtmr.c,v 1.17.2.1 2017/06/21 17:47:48 snj Exp $        */
+/*     $NetBSD: gtmr.c,v 1.17.2.2 2017/09/11 05:25:20 snj Exp $        */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.17.2.1 2017/06/21 17:47:48 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.17.2.2 2017/09/11 05:25:20 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -292,6 +292,10 @@
 
        arm_isb();
 
+       const uint32_t ctl = armreg_cntv_ctl_read();
+       if ((ctl & ARM_CNTCTL_ISTATUS) == 0)
+               return 0;
+
        const uint64_t now = armreg_cntv_ct_read();
        uint64_t delta = now - ci->ci_lastintr;