 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #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"
 #if defined(MULTIPROCESSOR)
 /*
  * These 'unop' insns will be patched with 'mb' insns at run-time if
  * the system has more than one processor.
  */
 #define	MB(label)	label: unop
 #else
 #define	MB(label)	/* nothing */
 #endif
 @@ -104,26 +104,27 @@ LEAF(mutex_exit, 1)
 	ldq_l	t2, 0(a0)
 	cmpeq	v0, t2, t2
 	beq	t2, 2f
 	stq_c	t3, 0(a0)
 	beq	t3, 3f
 	RET
 :
 	lda	t12, mutex_vector_exit
 	jmp	(t12)
 :
 	br	1b
 	END(mutex_exit)
 #if 0 /* XXX disabled for now XXX */
 /*
  * void mutex_spin_enter(kmutex_t *mtx);
  */
 LEAF(mutex_spin_enter, 1);
 	LDGP(pv)
 	/*
 	 * STEP 1: Perform the MUTEX_SPIN_SPLRAISE() function.
 	 * (see sys/kern/kern_mutex.c)
+	 *
 	 *	s = splraise(mtx->mtx_ipl);
 	 *	if (curcpu->ci_mtx_count-- == 0)
 	 *		curcpu->ci_mtx_oldspl = s;
 @@ -217,26 +218,27 @@ LEAF(mutex_spin_exit, 1)
 	ldl	a0, CPU_INFO_MTX_OLDSPL(a3)
 	addl	t0, 1, t2		/* mtx_count++ */
 	stl	t2, CPU_INFO_MTX_COUNT(a3)
 	/*
 	 * The forward-branch over the SWPIPL call is correctly predicted
 	 * not-taken by the CPU because it's rare for a code path to acquire
 	 * 2 spin mutexes.
 	 */
 	bne	t2, 1f			/* t2 != 0? Skip... */
 	call_pal PAL_OSF1_swpipl	/* clobbers v0, t0, t8..t11 */
 :
 	RET
 	END(mutex_spin_exit)
 #endif /* XXX disabled for now XXX */
 /*
  * void rw_enter(krwlock_t *rwl, krw_t op);
+ *
  * Acquire one hold on a RW lock.
  */
 LEAF(rw_enter, 2)
 	LDGP(pv)
 	/*
 	 * RW_READER == 0 (we have a compile-time assert in machdep.c
 	 * to ensure this).
+	 *
 @@ -389,23 +391,25 @@ LEAF(rw_exit, 1)
 #if defined(MULTIPROCESSOR)
 /*
  * Table of locations to patch with MB instructions on multiprocessor
  * systems.
  */
 	.section ".rodata"
 	.globl	lock_stub_patch_table
 lock_stub_patch_table:
 	.quad	.L__lock_cas_mb_1
 	.quad	.L__lock_cas_mb_2
 #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
 	.quad	.L_rw_tryenter_mb_2
 	.quad	.L_rw_exit_mb_1
 #endif /* ! LOCKDEBUG */
 	.quad	0		/* NULL terminator */
 #endif /* MULTIPROCESSOR */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -49,24 +49,24 @@ struct kmutex {
 			volatile uint16_t	mtxs_unused;
 			__cpu_simple_lock_t	mtxs_lock;
 		} s;
 	} u;
 };
 #define	mtx_owner 			u.mtxa_owner
 #define	mtx_flags 			u.s.mtxs_flags
 #define	mtx_ipl 			u.s.mtxs_ipl
 #define	mtx_lock 			u.s.mtxs_lock
 #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))
 int	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
 #endif	/* __MUTEX_PRIVATE */
 __CTASSERT(sizeof(struct kmutex) == sizeof(uintptr_t));
 #endif /* _ALPHA_MUTEX_H_ */