Provide <machine/lock.h> on all platforms, so that MI code may #include it

unconditionnaly.

11 files changed, 315 insertions, 0 deletions

diff --git a/sys/arch/hp300/include/lock.h b/sys/arch/hp300/include/lock.h
new file mode 100644
index 00000000000..97101bc5338
--- /dev/null
+++ b/sys/arch/hp300/include/lock.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:27 miod Exp $	*/
+/* public domain */
+#include <m68k/lock.h>
diff --git a/sys/arch/hppa/include/lock.h b/sys/arch/hppa/include/lock.h
new file mode 100644
index 00000000000..9df47129a62
--- /dev/null
+++ b/sys/arch/hppa/include/lock.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_HPPA_LOCK_H_
+#define	_HPPA_LOCK_H_
+
+typedef volatile u_int __cpu_simple_lock_t __attribute__((__aligned__(16)));
+
+#define	__SIMPLELOCK_LOCKED	0
+#define	__SIMPLELOCK_UNLOCKED	1
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		    ("ldcw %1, %0" : "=r" (old), "=m" (l) : "m" (l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	    ("ldcw %1, %0" : "=r" (old), "=m" (l) : "m" (l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _HPPA_LOCK_H_ */
diff --git a/sys/arch/m68k/include/lock.h b/sys/arch/m68k/include/lock.h
new file mode 100644
index 00000000000..475236a26d4
--- /dev/null
+++ b/sys/arch/m68k/include/lock.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_M68K_LOCK_H_
+#define	_M68K_LOCK_H_
+
+typedef volatile u_int __cpu_simple_lock_t;
+
+#define	__SIMPLELOCK_LOCKED	1
+#define	__SIMPLELOCK_UNLOCKED	0
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		    ("casl %0, %2, %1" : "+d" (old), "=m" (*l) : "d" (*l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	    ("casl %0, %2, %1" : "+d" (old), "=m" (*l) : "d" (*l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _M68K_LOCK_H_ */
diff --git a/sys/arch/mac68k/include/lock.h b/sys/arch/mac68k/include/lock.h
new file mode 100644
index 00000000000..a83fd0016e1
--- /dev/null
+++ b/sys/arch/mac68k/include/lock.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $	*/
+/* public domain */
+#include <m68k/lock.h>
diff --git a/sys/arch/mips64/include/lock.h b/sys/arch/mips64/include/lock.h
new file mode 100644
index 00000000000..be9b39b8e4c
--- /dev/null
+++ b/sys/arch/mips64/include/lock.h
@@ -0,0 +1,54 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_MIPS64_LOCK_H_
+#define	_MIPS64_LOCK_H_
+
+typedef volatile u_int __cpu_simple_lock_t;
+
+#define	__SIMPLELOCK_LOCKED	1
+#define	__SIMPLELOCK_UNLOCKED	0
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old, new;
+
+	do {
+		new = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		   ("1:\tll\t%0, %1\n" 
+		    "\tsc\t%2, %1\n"
+		    "\tbeqz\t%2, 1b\n"
+		    "\t nop" : "=r" (old) : "m" (*l), "r" (new));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old, new = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	   ("1:\tll\t%0, %1\n" 
+	    "\tsc\t%2, %1\n"
+	    "\tbeqz\t%2, 1b\n"
+	    "\t nop" : "=r" (old) : "m" (*l), "r" (new));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _MIPS64_LOCK_H_ */
diff --git a/sys/arch/mvme68k/include/lock.h b/sys/arch/mvme68k/include/lock.h
new file mode 100644
index 00000000000..a83fd0016e1
--- /dev/null
+++ b/sys/arch/mvme68k/include/lock.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:30 miod Exp $	*/
+/* public domain */
+#include <m68k/lock.h>
diff --git a/sys/arch/sgi/include/lock.h b/sys/arch/sgi/include/lock.h
new file mode 100644
index 00000000000..9f00e2a6496
--- /dev/null
+++ b/sys/arch/sgi/include/lock.h
@@ -0,0 +1,3 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $	*/
+/* public domain */
+#include <mips64/lock.h>
diff --git a/sys/arch/solbourne/include/lock.h b/sys/arch/solbourne/include/lock.h
new file mode 100644
index 00000000000..3dc7983ca4c
--- /dev/null
+++ b/sys/arch/solbourne/include/lock.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $ */
+/* public domain */
+#include <sparc/lock.h>
diff --git a/sys/arch/sparc/include/lock.h b/sys/arch/sparc/include/lock.h
new file mode 100644
index 00000000000..e9fa9224a53
--- /dev/null
+++ b/sys/arch/sparc/include/lock.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_SPARC_LOCK_H_
+#define	_SPARC_LOCK_H_
+
+typedef volatile u_int8_t __cpu_simple_lock_t;
+
+#define	__SIMPLELOCK_LOCKED	0xff
+#define	__SIMPLELOCK_UNLOCKED	0x00
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		    ("ldstub %0, %1" : "=m" (*l), "=r" (old) : "0" (*l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	    ("ldstub %0, %1" : "=m" (*l), "=r" (old) : "0" (*l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _SPARC_LOCK_H_ */
diff --git a/sys/arch/sparc64/include/lock.h b/sys/arch/sparc64/include/lock.h
new file mode 100644
index 00000000000..f57d7ca461c
--- /dev/null
+++ b/sys/arch/sparc64/include/lock.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_SPARC64_LOCK_H_
+#define	_SPARC64_LOCK_H_
+
+typedef volatile u_int8_t __cpu_simple_lock_t;
+
+#define	__SIMPLELOCK_LOCKED	0xff
+#define	__SIMPLELOCK_UNLOCKED	0x00
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		    ("ldstub %0, %1" : "=m" (*l), "=r" (old) : "0" (*l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	    ("ldstub %0, %1" : "=m" (*l), "=r" (old) : "0" (*l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _SPARC64_LOCK_H_ */
diff --git a/sys/arch/vax/include/lock.h b/sys/arch/vax/include/lock.h
new file mode 100644
index 00000000000..4620717f3ee
--- /dev/null
+++ b/sys/arch/vax/include/lock.h
@@ -0,0 +1,54 @@
+/*	$OpenBSD: lock.h,v 1.1 2007/05/01 18:56:31 miod Exp $	*/
+
+/* public domain */
+
+#ifndef	_VAX_LOCK_H_
+#define	_VAX_LOCK_H_
+
+typedef volatile u_int	__cpu_simple_lock_t;
+
+#define	__SIMPLELOCK_LOCKED	1
+#define	__SIMPLELOCK_UNLOCKED	0
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		   ("\tmovl\t$1, %1\n"		/* _SPLINLOCK_LOCKED */
+		    "\tbbssi\t$0, %0, 1f\n"
+		    "\tmovl\t$0, %1\n"		/* _SPLINLOCK_UNLOCKED */
+		    "1:\n" : "=m" (*l), "=r" (old) : "0" (*l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	   ("\tmovl\t$1, %1\n"		/* _SPLINLOCK_LOCKED */
+	    "\tbbssi\t$0, %0, 1f\n"
+	    "\tmovl\t$0, %1\n"		/* _SPLINLOCK_UNLOCKED */
+	    "1:\n" : "=m" (*l), "=r" (old) : "0" (*l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+#endif	/* _VAX_LOCK_H_ */