summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasper <jasper@openbsd.org>2013-03-13 14:30:57 +0000
committerjasper <jasper@openbsd.org>2013-03-13 14:30:57 +0000
commit5b9ea826b32b3c6f6c1f3ec5310f87709ee62716 (patch)
treebff21b8588dbf46aad2fc923943de8459500527a
parentin debug mode, log successful connections, from Jan Stary (diff)
downloadwireguard-openbsd-5b9ea826b32b3c6f6c1f3ec5310f87709ee62716.tar.xz
wireguard-openbsd-5b9ea826b32b3c6f6c1f3ec5310f87709ee62716.zip
Allow octeon to reboot by poking the right address for a soft cpu reset.
No more yanking the powercable when I hit ddb :) also tested by bcallah@ ok bcallah@ chris@ yasuoka@
-rw-r--r--sys/arch/octeon/octeon/machdep.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index a10c1c8e299..0d24067f29b 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.23 2012/10/08 21:47:50 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.24 2013/03/13 14:30:57 jasper Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -682,12 +682,11 @@ haltsys:
else
printf("System Halt.\n");
} else {
- void (*__reset)(void) = (void (*)(void))RESET_EXC_VEC;
printf("System restart.\n");
(void)disableintr();
tlb_set_wired(0);
tlb_flush(bootcpu_hwinfo.tlbsize);
- __reset();
+ octeon_write_csr(OCTEON_CIU_BASE + CIU_SOFT_RST, 1);
}
for (;;) ;