 @@ -1,14 +1,14 @@
-# $NetBSD: genassym.cf,v 1.29 2021/07/11 01:58:41 thorpej Exp $
+# $NetBSD: genassym.cf,v 1.30 2021/07/12 15:21:51 thorpej Exp $
+#
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
+#
 # 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.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 @@ -57,34 +57,36 @@
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
+#
 #	from: @(#)genassym.c	8.3 (Berkeley) 1/4/94
+#
 quote #define __RWLOCK_PRIVATE
 quote #define __MUTEX_PRIVATE
 include <sys/param.h>
 include <sys/buf.h>
 include <sys/proc.h>
 include <sys/sched.h>
 include <sys/mbuf.h>
 include <sys/msgbuf.h>
 include <sys/rwlock.h>
 include <sys/mutex.h>
 include <sys/syscall.h>
 include <machine/cpu.h>
 include <machine/reg.h>
 include <machine/frame.h>
 include <machine/rpb.h>
 include <machine/vmparam.h>
 include <uvm/uvm_extern.h>
 # general constants
 define	VM_MAX_ADDRESS		VM_MAX_ADDRESS
 define	ALPHA_PGBYTES		ALPHA_PGBYTES
 @@ -188,20 +190,24 @@ define	ALPHA_KENTRY_UNA	ALPHA_KENTRY_UNA
 # errno values
 define	ENAMETOOLONG		ENAMETOOLONG
 define	EFAULT			EFAULT
 # Syscalls called from sigreturn.
 define	SYS_compat_16___sigreturn14	SYS_compat_16___sigreturn14
 define	SYS_exit		SYS_exit
 # CPU info
 define	CPU_INFO_CURLWP		offsetof(struct cpu_info, ci_curlwp)
 define	CPU_INFO_IDLE_LWP	offsetof(struct cpu_info, ci_data.cpu_idlelwp)
 define	CPU_INFO_SSIR		offsetof(struct cpu_info, ci_ssir)
 define	CPU_INFO_MTX_COUNT	offsetof(struct cpu_info, ci_mtx_count)
 define	CPU_INFO_MTX_OLDSPL	offsetof(struct cpu_info, ci_mtx_oldspl)
 define	CPU_INFO_SIZEOF		sizeof(struct cpu_info)
 # Bits in lock fields
 define	RW_WRITE_WANTED		RW_WRITE_WANTED
 define	RW_WRITE_LOCKED		RW_WRITE_LOCKED
 define	RW_READ_INCR		RW_READ_INCR
 define	RW_READ_COUNT_SHIFT	RW_READ_COUNT_SHIFT
 define	MUTEX_IPL		offsetof(struct kmutex, mtx_ipl)
 define	MUTEX_SIMPLELOCK	offsetof(struct kmutex, mtx_lock)
 define	__SIMPLELOCK_LOCKED	__SIMPLELOCK_LOCKED

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $	*/
+/*	$NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 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.5 2021/07/11 01:58:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.6 2021/07/12 15:21:51 thorpej Exp $");
 #include "assym.h"
 #if defined(MULTIPROCESSOR)
 #define	MB		mb
 #else
 #define	MB		/* nothing */
 #endif
 /*
  * int	_lock_cas(uintptr_t *ptr, uintptr_t old, uintptr_t new)
  */
 LEAF(_lock_cas, 3)
 @@ -101,26 +101,140 @@ LEAF(mutex_exit, 1)
 	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)
 /*
  * 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;
 	 */
 	call_pal PAL_OSF1_rdps		/* clobbers v0, t0, t8..t11 */
 					/* v0 = cur_ipl */
 #ifdef __BWX__
 	mov	a0, a1			/* a1 = mtx */
 	ldbu	a0, MUTEX_IPL(a0)	/* a0 = new_ipl */
 	mov	v0, a4			/* save cur_ipl in a4 */
 #else
 	mov	a0, a1			/* a1 = mtx */
 	ldq_u	a2, MUTEX_IPL(a0)
 	mov	v0, a4			/* save cur_ipl in a4 */
 	extbl	a2, MUTEX_IPL, a0	/* a0 = new_ipl */
 #endif /* __BWX__ */
 	cmplt	v0, a0, a3		/* a3 = (cur_ipl < new_ipl) */
 	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	mov	v0, a5			/* save curlwp in a5 */
 	/*
 	 * 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.
 	 */
 	beq	a3, 1f			/*      no? -> skip... */
 	call_pal PAL_OSF1_swpipl	/* clobbers v0, t0, t8..t11 */
 	/*
 	 * v0 returns the old_ipl, which will be the same as the
 	 * cur_ipl we squirreled away in a4 earlier.
 	 */
 :
 	/*
 	 * curlwp->l_cpu is now stable.  Update the counter and
 	 * stash the old_ipl.  Just in case it's not clear what's
 	 * going on, we:
+	 *
 	 *	- Load previous value of mtx_oldspl into t1.
 	 *	- Conditionally move old_ipl into t1 if mtx_count == 0.
 	 *	- Store t1 back to mtx_oldspl; if mtx_count != 0,
 	 *	  the store is redundant, but it's faster than a forward
 	 *	  branch.
 	 */
 	ldq	a3, L_CPU(a5)		/* a3 = curlwp->l_cpu (curcpu) */
 	ldl	t0, CPU_INFO_MTX_COUNT(a3)
 	ldl	t1, CPU_INFO_MTX_OLDSPL(a3)
 	cmoveq	t0, a4, t1		/* mtx_count == 0? -> t1 = old_ipl */
 	subl	t0, 1, t2		/* mtx_count-- */
 	stl	t1, CPU_INFO_MTX_OLDSPL(a3)
 	stl	t2, CPU_INFO_MTX_COUNT(a3)
 	/*
 	 * STEP 2: __cpu_simple_lock_try(&mtx->mtx_lock)
 	 */
 	ldl_l	t0, MUTEX_SIMPLELOCK(a1)
 	ldiq	t1, __SIMPLELOCK_LOCKED
 	bne	t0, 2f			/* contended */
 	stl_c	t1, MUTEX_SIMPLELOCK(a1)
 	beq	t1, 2f			/* STL_C failed; consider contended */
 	MB
 	RET
 :
 	mov	a1, a0			/* restore first argument */
 	lda	pv, mutex_spin_retry
 	jmp	(pv)
 	END(mutex_spin_enter)
 /*
  * void mutex_spin_exit(kmutex_t *mtx);
  */
 LEAF(mutex_spin_exit, 1)
 	LDGP(pv);
 	MB
 	/*
 	 * STEP 1: __cpu_simple_unlock(&mtx->mtx_lock)
 	 */
 	stl	zero, MUTEX_SIMPLELOCK(a0)
 	/*
 	 * STEP 2: Perform the MUTEX_SPIN_SPLRESTORE() function.
 	 * (see sys/kern/kern_mutex.c)
+	 *
 	 *	s = curcpu->ci_mtx_oldspl;
 	 *	if (++curcpu->ci_mtx_count == 0)
 	 *		splx(s);
 	 */
 	GET_CURLWP	/* Note: GET_CURLWP clobbers v0, t0, t8...t11. */
 	ldq	a3, L_CPU(v0)		/* a3 = curlwp->l_cpu (curcpu) */
 	ldl	t0, CPU_INFO_MTX_COUNT(a3)
 	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)
 /*
  * 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).
+	 *
 	 * Acquire for read is the most common case.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.8 2020/09/23 00:52:49 thorpej Exp $	*/
+/*	$NetBSD: mutex.h,v 1.9 2021/07/12 15:21:51 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,23 +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
 #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_ */