Thu Apr 16 08:03:30 2020 UTC ()
add the case of kdb_trap(-1) called from pic_ipi_ddb().
it depended on the update timing of 'db_recover'.


(ryo)
diff -r1.20 -r1.21 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs diff -r1.20 -r1.21 src/sys/arch/aarch64/aarch64/db_machdep.c (expand / switch to unified diff)

--- src/sys/arch/aarch64/aarch64/db_machdep.c 2020/02/29 21:30:19 1.20
+++ src/sys/arch/aarch64/aarch64/db_machdep.c 2020/04/16 08:03:30 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: db_machdep.c,v 1.20 2020/02/29 21:30:19 ryo Exp $ */ 1/* $NetBSD: db_machdep.c,v 1.21 2020/04/16 08:03:30 ryo Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2014 The NetBSD Foundation, Inc. 4 * Copyright (c) 2014 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 of 3am Software Foundry. 8 * by Matt Thomas of 3am Software Foundry.
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: db_machdep.c,v 1.20 2020/02/29 21:30:19 ryo Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.21 2020/04/16 08:03:30 ryo Exp $");
34 34
35#ifdef _KERNEL_OPT 35#ifdef _KERNEL_OPT
36#include "opt_compat_netbsd32.h" 36#include "opt_compat_netbsd32.h"
37#endif 37#endif
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/atomic.h> 41#include <sys/atomic.h>
42#include <sys/cpu.h> 42#include <sys/cpu.h>
43#include <sys/lwp.h> 43#include <sys/lwp.h>
44#include <sys/intr.h> 44#include <sys/intr.h>
45 45
46#include <uvm/uvm.h> 46#include <uvm/uvm.h>
@@ -926,26 +926,27 @@ int @@ -926,26 +926,27 @@ int
926kdb_trap(int type, struct trapframe *tf) 926kdb_trap(int type, struct trapframe *tf)
927{ 927{
928#ifdef MULTIPROCESSOR 928#ifdef MULTIPROCESSOR
929 struct cpu_info * const ci = curcpu(); 929 struct cpu_info * const ci = curcpu();
930#endif 930#endif
931 int s; 931 int s;
932 932
933 switch (type) { 933 switch (type) {
934 case DB_TRAP_UNKNOWN: 934 case DB_TRAP_UNKNOWN:
935 case DB_TRAP_BREAKPOINT: 935 case DB_TRAP_BREAKPOINT:
936 case DB_TRAP_BKPT_INSN: 936 case DB_TRAP_BKPT_INSN:
937 case DB_TRAP_WATCHPOINT: 937 case DB_TRAP_WATCHPOINT:
938 case DB_TRAP_SW_STEP: 938 case DB_TRAP_SW_STEP:
 939 case -1: /* from pic_ipi_ddb() */
939 break; 940 break;
940 default: 941 default:
941 if (db_recover != 0) { 942 if (db_recover != 0) {
942 db_error("Faulted in DDB: continuing...\n"); 943 db_error("Faulted in DDB: continuing...\n");
943 /* NOTREACHED */ 944 /* NOTREACHED */
944 } 945 }
945 break; 946 break;
946 } 947 }
947 948
948#ifdef MULTIPROCESSOR 949#ifdef MULTIPROCESSOR
949 /* 950 /*
950 * Try to take ownership of DDB. 951 * Try to take ownership of DDB.
951 * If we do, tell all other CPUs to enter DDB too. 952 * If we do, tell all other CPUs to enter DDB too.