[src/trunk]: src/sys/arch/aarch64/aarch64 When booted with "boot netbsd -1" (...

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

details:   https://anonhg.NetBSD.org/src/rev/35b8e6e124d5
branches:  trunk
changeset: 1024312:35b8e6e124d5
user:      ryo <ryo%NetBSD.org@localhost>
date:      Sun Oct 17 22:44:34 2021 +0000

description:
When booted with "boot netbsd -1" (disable multiprocessor boot),
"ddb>continue" didn't work when ddb was started by breakpoint trap.

diffstat:

 sys/arch/aarch64/aarch64/db_machdep.c |  39 +++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diffs (62 lines):

diff -r ec1dc1164529 -r 35b8e6e124d5 sys/arch/aarch64/aarch64/db_machdep.c
--- a/sys/arch/aarch64/aarch64/db_machdep.c     Sun Oct 17 22:34:17 2021 +0000
+++ b/sys/arch/aarch64/aarch64/db_machdep.c     Sun Oct 17 22:44:34 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.40 2021/04/30 20:07:22 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.41 2021/10/17 22:44:34 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.40 2021/04/30 20:07:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.41 2021/10/17 22:44:34 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -1145,25 +1145,26 @@
        }
 
 #ifdef MULTIPROCESSOR
-       /*
-        * Try to take ownership of DDB.
-        * If we do, tell all other CPUs to enter DDB too.
-        */
-       if ((ncpu > 1) &&
-           (atomic_cas_ptr(&db_onproc, NULL, ci) == NULL)) {
-               intr_ipi_send(NULL, IPI_DDB);
-               db_trigger = ci;
-       } else {
+       if (ncpu > 1) {
                /*
-                * If multiple CPUs catch kdb_trap() that is not IPI_DDB derived
-                * at the same time, only the CPU that was able to get db_onproc
-                * first will execute db_trap.
-                * The CPU that could not get db_onproc will be set to type = -1
-                * once, and kdb_trap will be called again with the correct type
-                * after kdb_trap returns.
+                * Try to take ownership of DDB.
+                * If we do, tell all other CPUs to enter DDB too.
                 */
-               type = -1;
-               restore_hw_watchpoints = true;
+               if (atomic_cas_ptr(&db_onproc, NULL, ci) == NULL) {
+                       intr_ipi_send(NULL, IPI_DDB);
+                       db_trigger = ci;
+               } else {
+                       /*
+                        * If multiple CPUs catch kdb_trap() that is not IPI_DDB
+                        * derived at the same time, only the CPU that was able
+                        * to get db_onproc first will execute db_trap.
+                        * The CPU that could not get db_onproc will be set to
+                        * type = -1 once, and kdb_trap will be called again
+                        * with the correct type after kdb_trap returns.
+                        */
+                       type = -1;
+                       restore_hw_watchpoints = true;
+               }
        }
        db_readytoswitch[ci->ci_index] = tf;
 #endif