Thu Sep 9 21:39:03 2021 UTC ()
If we get a spurious interrupt, log a debug message and ignore it.

Otherwise we risk tripping an assertion later on due to an interrupt
firing before it is scheduled.


(jmcneill)
diff -r1.44 -r1.45 src/sys/arch/arm/cortex/gtmr.c
cvs diff -r1.44 -r1.45 src/sys/arch/arm/cortex/gtmr.c (expand / switch to unified diff)

--- src/sys/arch/arm/cortex/gtmr.c 2021/08/30 22:53:37 1.44
+++ src/sys/arch/arm/cortex/gtmr.c 2021/09/09 21:39:02 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gtmr.c,v 1.44 2021/08/30 22:53:37 jmcneill Exp $ */ 1/* $NetBSD: gtmr.c,v 1.45 2021/09/09 21:39:02 jmcneill Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Matt Thomas 8 * by Matt Thomas
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.44 2021/08/30 22:53:37 jmcneill Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.45 2021/09/09 21:39:02 jmcneill Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/bus.h> 36#include <sys/bus.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/intr.h> 38#include <sys/intr.h>
39#include <sys/kernel.h> 39#include <sys/kernel.h>
40#include <sys/percpu.h> 40#include <sys/percpu.h>
41#include <sys/proc.h> 41#include <sys/proc.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43#include <sys/timetc.h> 43#include <sys/timetc.h>
44#include <sys/cpu.h> 44#include <sys/cpu.h>
45 45
46#include <prop/proplib.h> 46#include <prop/proplib.h>
@@ -324,26 +324,32 @@ gtmr_delay(unsigned int n) @@ -324,26 +324,32 @@ gtmr_delay(unsigned int n)
324 324
325/* 325/*
326 * gtmr_intr: 326 * gtmr_intr:
327 * 327 *
328 * Handle the hardclock interrupt. 328 * Handle the hardclock interrupt.
329 */ 329 */
330int 330int
331gtmr_intr(void *arg) 331gtmr_intr(void *arg)
332{ 332{
333 struct cpu_info * const ci = curcpu(); 333 struct cpu_info * const ci = curcpu();
334 struct clockframe * const cf = arg; 334 struct clockframe * const cf = arg;
335 struct gtmr_softc * const sc = &gtmr_sc; 335 struct gtmr_softc * const sc = &gtmr_sc;
336 336
 337 const uint32_t ctl = gtmr_read_ctl(sc);
 338 if ((ctl & (CNTCTL_ENABLE|CNTCTL_ISTATUS)) != (CNTCTL_ENABLE|CNTCTL_ISTATUS)) {
 339 aprint_debug_dev(ci->ci_dev, "spurious timer interrupt (ctl=%#x)\n", ctl);
 340 return 0;
 341 }
 342
337 const uint64_t now = gtmr_read_cntct(sc); 343 const uint64_t now = gtmr_read_cntct(sc);
338 uint64_t delta = now - ci->ci_lastintr; 344 uint64_t delta = now - ci->ci_lastintr;
339 345
340#ifdef DIAGNOSTIC 346#ifdef DIAGNOSTIC
341 struct gtmr_percpu *pc = NULL; 347 struct gtmr_percpu *pc = NULL;
342 if (!ISSET(sc->sc_flags, GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER)) { 348 if (!ISSET(sc->sc_flags, GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER)) {
343 const uint64_t then = sc->sc_physical ? gtmr_cntp_cval_read() : gtmr_cntv_cval_read(); 349 const uint64_t then = sc->sc_physical ? gtmr_cntp_cval_read() : gtmr_cntv_cval_read();
344 pc = percpu_getref(sc->sc_percpu); 350 pc = percpu_getref(sc->sc_percpu);
345 KASSERTMSG(then <= now, "%"PRId64, now - then); 351 KASSERTMSG(then <= now, "%"PRId64, now - then);
346 KASSERTMSG(then + pc->pc_delta >= ci->ci_lastintr + sc->sc_autoinc, 352 KASSERTMSG(then + pc->pc_delta >= ci->ci_lastintr + sc->sc_autoinc,
347 "%"PRId64, then + pc->pc_delta - ci->ci_lastintr - sc->sc_autoinc); 353 "%"PRId64, then + pc->pc_delta - ci->ci_lastintr - sc->sc_autoinc);
348 } 354 }
349#endif 355#endif