diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-08-06 18:39:14 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-08-06 18:39:14 +0000 |
| commit | e312b4b9ce317a99f0161d16658453ef76fe4ab0 (patch) | |
| tree | 5afec0a16f9c89fe966e0002f2333c180f6705e7 /sys/arch/armv7 | |
| parent | 6144ffe81a725d8d8c36e4b94faf193c58cc252d (diff) | |
Make it possible to build a MULTIPROCESSOR kernel on armv7. While this
doesn't actually spin up any secondary CPUs, it does run. Mostly a cleanup
of <machine/cpu.h> along the lines of what I did earlier on arm64. Makes
armv7 use the MI mplock implementation and implements copyin32.
ok patrick@
Diffstat (limited to 'sys/arch/armv7')
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/armv7_start.S | 7 | ||||
| -rw-r--r-- | sys/arch/armv7/armv7/locore0.S | 7 | ||||
| -rw-r--r-- | sys/arch/armv7/include/mplock.h | 3 |
4 files changed, 11 insertions, 10 deletions
diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c index 41abc53ac50..988f64163a2 100644 --- a/sys/arch/armv7/armv7/armv7_machdep.c +++ b/sys/arch/armv7/armv7/armv7_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_machdep.c,v 1.54 2018/05/31 09:12:59 kettenis Exp $ */ +/* $OpenBSD: armv7_machdep.c,v 1.55 2018/08/06 18:39:13 kettenis Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -256,7 +256,7 @@ haltsys: config_suspend_all(DVACT_POWERDOWN); /* Make sure IRQ's are disabled */ - IRQdisable; + intr_disable(); if ((howto & RB_HALT) != 0) { if ((howto & RB_POWERDOWN) != 0) { diff --git a/sys/arch/armv7/armv7/armv7_start.S b/sys/arch/armv7/armv7/armv7_start.S index db7292f7c65..47160b5c0ac 100644 --- a/sys/arch/armv7/armv7/armv7_start.S +++ b/sys/arch/armv7/armv7/armv7_start.S @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_start.S,v 1.15 2017/10/26 02:48:36 jsg Exp $ */ +/* $OpenBSD: armv7_start.S,v 1.16 2018/08/06 18:39:13 kettenis Exp $ */ /* $NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */ /* @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "assym.h" + #include <machine/asm.h> #include <arm/sysreg.h> #include <arm/armreg.h> #include <arm/pte.h> -#undef DOMAIN_CLIENT /* XXX */ -#include "assym.h" - #ifdef __clang__ .arch_extension sec .arch_extension virt diff --git a/sys/arch/armv7/armv7/locore0.S b/sys/arch/armv7/armv7/locore0.S index 62bbcb1bc39..13cfb9b3c84 100644 --- a/sys/arch/armv7/armv7/locore0.S +++ b/sys/arch/armv7/armv7/locore0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore0.S,v 1.4 2018/01/20 23:57:44 jsg Exp $ */ +/* $OpenBSD: locore0.S,v 1.5 2018/08/06 18:39:13 kettenis Exp $ */ /* $NetBSD: lubbock_start.S,v 1.1 2003/06/18 10:51:15 bsh Exp $ */ /* @@ -30,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "assym.h" + #include <machine/asm.h> #include <arm/sysreg.h> #include <arm/armreg.h> #include <arm/pte.h> -#undef DOMAIN_CLIENT /* XXX */ -#include "assym.h" - #ifdef __clang__ .arch_extension virt #define ELR msr ELR_hyp, lr diff --git a/sys/arch/armv7/include/mplock.h b/sys/arch/armv7/include/mplock.h new file mode 100644 index 00000000000..95913991b2e --- /dev/null +++ b/sys/arch/armv7/include/mplock.h @@ -0,0 +1,3 @@ +/* $OpenBSD: mplock.h,v 1.1 2018/08/06 18:39:13 kettenis Exp $ */ + +#include <arm/mplock.h> |