summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorsekiya <sekiya@NetBSD.org>2003-12-30 23:56:19 +0000
committersekiya <sekiya@NetBSD.org>2003-12-30 23:56:19 +0000
commitd721fc82ce9a1504eebbcd1fedb0fa9cef52c6f7 (patch)
treeb40f2edfb403c9639592465d4dabfd095963023f /sys
parent1cf4c96f39fe7252838ddab105287059131025d2 (diff)
Force ARCS console for IP20 until the console-on-zs crashing problem is
fixed. Store the board revision for future use, while we're at it.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgimips/sgimips/console.c10
-rw-r--r--sys/arch/sgimips/sgimips/ip2x.c7
2 files changed, 11 insertions, 6 deletions
diff --git a/sys/arch/sgimips/sgimips/console.c b/sys/arch/sgimips/sgimips/console.c
index 6206c17ac82..a5468d97864 100644
--- a/sys/arch/sgimips/sgimips/console.c
+++ b/sys/arch/sgimips/sgimips/console.c
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.15 2003/12/16 10:20:10 sekiya Exp $ */
+/* $NetBSD: console.c,v 1.16 2003/12/30 23:56:19 sekiya Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.15 2003/12/16 10:20:10 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.16 2003/12/30 23:56:19 sekiya Exp $");
#include "opt_kgdb.h"
#include "opt_machtypes.h"
@@ -106,10 +106,12 @@ consinit()
}
}
#endif
-
#if (defined(IP2X)) && (NZSC > 0)
- if (mach_type == MACH_SGI_IP20 || mach_type == MACH_SGI_IP22) {
+ /* zs console on IP20 crashes the machine fast, use ARCS for now */
+ if (mach_type == MACH_SGI_IP20)
+ goto force_arcs;
+ else if (mach_type == MACH_SGI_IP22) {
if (strlen(consdev) == 9 &&
strncmp(consdev, "serial", 6) == 0 &&
(consdev[7] == '0' || consdev[7] == '1')) {
diff --git a/sys/arch/sgimips/sgimips/ip2x.c b/sys/arch/sgimips/sgimips/ip2x.c
index 21243f5d90a..9d4897a9554 100644
--- a/sys/arch/sgimips/sgimips/ip2x.c
+++ b/sys/arch/sgimips/sgimips/ip2x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ip2x.c,v 1.1 2003/12/15 13:02:28 sekiya Exp $ */
+/* $NetBSD: ip2x.c,v 1.2 2003/12/30 23:56:19 sekiya Exp $ */
/*
* Copyright (c) 2001, 2002 Rafal K. Boni
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.1 2003/12/15 13:02:28 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.2 2003/12/30 23:56:19 sekiya Exp $");
#include "opt_cputype.h"
#include "opt_machtypes.h"
@@ -84,6 +84,9 @@ ip2x_init(void)
{
mach_type = MACH_SGI_IP20;
int23addr = 0x1fb801c0;
+
+ sysid = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd0000);
+ mach_boardrev = (sysid & 0x7000) >> 12;
}
else
{