[src/trunk]: src/sys/arch/alpha Disable the mutex_spin_{enter,exit}() fast-pa...

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

details:   https://anonhg.NetBSD.org/src/rev/2250ae4d6704
branches:  trunk
changeset: 984612:2250ae4d6704
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 14 02:18:10 2021 +0000

description:
Disable the mutex_spin_{enter,exit}() fast-path stubs while I investigate
some an odd IPL-related panic that seems to be related (that I can fairly
reliabily reproduce on an LCA45).

diffstat:

 sys/arch/alpha/alpha/lock_stubs.s |  8 ++++++--
 sys/arch/alpha/include/mutex.h    |  4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r 63b25968bc92 -r 2250ae4d6704 sys/arch/alpha/alpha/lock_stubs.s
--- a/sys/arch/alpha/alpha/lock_stubs.s Tue Jul 13 22:01:34 2021 +0000
+++ b/sys/arch/alpha/alpha/lock_stubs.s Wed Jul 14 02:18:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lock_stubs.s,v 1.8 2021/07/13 13:58:30 thorpej Exp $   */
+/*     $NetBSD: lock_stubs.s,v 1.9 2021/07/14 02:18:10 thorpej Exp $   */
 
 /*-
  * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <machine/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.8 2021/07/13 13:58:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.9 2021/07/14 02:18:10 thorpej Exp $");
 
 #include "assym.h"
 
@@ -114,6 +114,7 @@
        br      1b
        END(mutex_exit)
 
+#if 0 /* XXX disabled for now XXX */
 /*
  * void mutex_spin_enter(kmutex_t *mtx);
  */
@@ -227,6 +228,7 @@
 1:
        RET
        END(mutex_spin_exit)
+#endif /* XXX disabled for now XXX */
 
 /*
  * void rw_enter(krwlock_t *rwl, krw_t op);
@@ -399,8 +401,10 @@
 #if !defined(LOCKDEBUG)
        .quad   .L_mutex_enter_mb_1
        .quad   .L_mutex_exit_mb_1
+#if 0 /* XXX disabled for now XXX */
        .quad   .L_mutex_spin_enter_mb_1
        .quad   .L_mutex_spin_exit_mb_1
+#endif /* XXX disabled for now XXX */
        .quad   .L_rw_enter_mb_1
        .quad   .L_rw_enter_mb_2
        .quad   .L_rw_tryenter_mb_1
diff -r 63b25968bc92 -r 2250ae4d6704 sys/arch/alpha/include/mutex.h
--- a/sys/arch/alpha/include/mutex.h    Tue Jul 13 22:01:34 2021 +0000
+++ b/sys/arch/alpha/include/mutex.h    Wed Jul 14 02:18:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.9 2021/07/12 15:21:51 thorpej Exp $        */
+/*     $NetBSD: mutex.h,v 1.10 2021/07/14 02:18:10 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 
 #define        __HAVE_SIMPLE_MUTEXES           1
 #define        __HAVE_MUTEX_STUBS              1
-#define        __HAVE_SPIN_MUTEX_STUBS         1
+/* XXX #define __HAVE_SPIN_MUTEX_STUBS         1 XXX */
 
 #define        MUTEX_CAS(p, o, n)              _lock_cas((p), (o), (n))