unify the mutex implementations on all the mips64 platforms.

this basically copies the sgi implementation to mips64 and removes
it from the rest. this way they get an optimised UP mutex implementation
and correct asserts on all platforms.

ok miod@ jmatthew@

4 files changed, 6 insertions, 203 deletions

diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 68dd99ff8ba..b8c0b5b439b 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sgi,v 1.52 2013/11/04 14:07:16 deraadt Exp $
+#	$OpenBSD: files.sgi,v 1.53 2015/07/08 13:37:31 dlg Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -23,7 +23,6 @@ file	arch/sgi/sgi/ip32_machdep.c		tgt_o2
 file	arch/sgi/sgi/l1.c			tgt_origin
 file	arch/sgi/sgi/machdep.c
 file	arch/sgi/sgi/mainbus.c
-file	arch/sgi/sgi/mutex.c
 file	arch/sgi/sgi/sginode.c			tgt_origin
 file	arch/sgi/sgi/wscons_machdep.c		wsdisplay
 
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 9fb7c95651e..92125694f94 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.43 2013/05/17 19:38:52 kettenis Exp $ */
+/*	$OpenBSD: intr.h,v 1.44 2015/07/08 13:37:31 dlg Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -59,6 +59,8 @@
 #define	IPL_IPI         8       /* interprocessor interrupt */
 #define	NIPLS		9	/* Number of levels */
 
+#define IPL_MPFLOOR	IPL_TTY
+
 /* Interrupt priority 'flags'. */
 #define	IPL_MPSAFE	0	/* no "mpsafe" interrupts */
 
diff --git a/sys/arch/sgi/include/mutex.h b/sys/arch/sgi/include/mutex.h
index 8d44c879270..b13515a4101 100644
--- a/sys/arch/sgi/include/mutex.h
+++ b/sys/arch/sgi/include/mutex.h
@@ -1,73 +1,3 @@
-/*	$OpenBSD: mutex.h,v 1.8 2015/04/21 01:31:51 dlg Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.9 2015/07/08 13:37:31 dlg Exp $	*/
 
-/*
- * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR 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. 
- */
-
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
-
-struct mutex {
-	void *mtx_owner;
-	int mtx_wantipl;
-	int mtx_oldipl;
-};
-
-/*
- * To prevent lock ordering problems with the kernel lock, we need to
- * make sure we block all interrupts that can grab the kernel lock.
- * The simplest way to achieve this is to make sure mutexes always
- * raise the interrupt priority level to the highest level that has
- * interrupts that grab the kernel lock.
- */
-#ifdef MULTIPROCESSOR
-#define __MUTEX_IPL(ipl) \
-    (((ipl) > IPL_NONE && (ipl) < IPL_TTY) ? IPL_TTY : (ipl))
-#else
-#define __MUTEX_IPL(ipl) (ipl)
-#endif
-
-#define MUTEX_INITIALIZER(ipl) { NULL, __MUTEX_IPL((ipl)), IPL_NONE }
-
-void __mtx_init(struct mutex *, int);
-#define mtx_init(mtx, ipl) __mtx_init((mtx), __MUTEX_IPL((ipl)))
-
-#ifdef DIAGNOSTIC
-#define MUTEX_ASSERT_LOCKED(mtx) do {					\
-	if ((mtx)->mtx_owner != curcpu())				\
-		panic("mutex %p not held in %s", (mtx), __func__);	\
-} while (0)
-
-#define MUTEX_ASSERT_UNLOCKED(mtx) do {					\
-	if ((mtx)->mtx_owner == curcpu())				\
-		panic("mutex %p held in %s", (mtx), __func__);		\
-} while (0)
-#else
-#define MUTEX_ASSERT_LOCKED(mtx) do { } while (0)
-#define MUTEX_ASSERT_UNLOCKED(mtx) do { } while (0)
-#endif
-
-#define MUTEX_OLDIPL(mtx)	(mtx)->mtx_oldipl
-
-#endif
+#include <mips64/mutex.h>
diff --git a/sys/arch/sgi/sgi/mutex.c b/sys/arch/sgi/sgi/mutex.c
deleted file mode 100644
index c5764e82600..00000000000
--- a/sys/arch/sgi/sgi/mutex.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$OpenBSD: mutex.c,v 1.15 2015/04/21 01:31:51 dlg Exp $	*/
-
-/*
- * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * 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. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR 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. 
- */
-
-#include <sys/param.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <sys/atomic.h>
-
-#include <machine/intr.h>
-
-
-void
-__mtx_init(struct mutex *mtx, int wantipl)
-{
-	mtx->mtx_owner = NULL;
-	mtx->mtx_wantipl = wantipl;
-	mtx->mtx_oldipl = IPL_NONE;
-}
-
-#ifdef MULTIPROCESSOR
-void
-mtx_enter(struct mutex *mtx)
-{
-	while (mtx_enter_try(mtx) == 0)
-		;
-}
-
-int
-mtx_enter_try(struct mutex *mtx)
-{
-	struct cpu_info *owner, *ci = curcpu();
-	int s;
-	
- 	if (mtx->mtx_wantipl != IPL_NONE)
-		s = splraise(mtx->mtx_wantipl);
-
-	owner = atomic_cas_ptr(&mtx->mtx_owner, NULL, ci);
-#ifdef DIAGNOSTIC
-	if (__predict_false(owner == ci))
-		panic("mtx %p: locking against myself", mtx);
-#endif
-	if (owner == NULL) {
-		if (mtx->mtx_wantipl != IPL_NONE)
-			mtx->mtx_oldipl = s;
-#ifdef DIAGNOSTIC
-		ci->ci_mutex_level++;
-#endif
-		membar_enter();
-		return (1);
-	}
-
-	if (mtx->mtx_wantipl != IPL_NONE)
-		splx(s);
-
-	return (0);
-}
-#else
-void
-mtx_enter(struct mutex *mtx)
-{
-	struct cpu_info *ci = curcpu();
-
-#ifdef DIAGNOSTIC
-	if (__predict_false(mtx->mtx_owner == ci))
-		panic("mtx %p: locking against myself", mtx);
-#endif
-
-	if (mtx->mtx_wantipl != IPL_NONE)
-		mtx->mtx_oldipl = splraise(mtx->mtx_wantipl);
-
-	mtx->mtx_owner = ci;
-
-#ifdef DIAGNOSTIC
-	ci->ci_mutex_level++;
-#endif
-}
-
-int
-mtx_enter_try(struct mutex *mtx)
-{
-	mtx_enter(mtx);
-	return (1);
-}
-#endif
-
-void
-mtx_leave(struct mutex *mtx)
-{
-	int s;
-
-	MUTEX_ASSERT_LOCKED(mtx);
-
-#ifdef MULTIPROCESSOR
-	membar_exit();
-#endif
-#ifdef DIAGNOSTIC
-	curcpu()->ci_mutex_level--;
-#endif
-
-	s = mtx->mtx_oldipl;
-	mtx->mtx_owner = NULL;
-	if (mtx->mtx_wantipl != IPL_NONE)
-		splx(s);
-}