Module Name: src
Committed By: matt
Date: Wed Dec 29 00:20:37 UTC 2010
Modified Files:
src/sys/arch/pmax/pmax [matt-nb5-mips64]: dec_3100.c dec_3max.c
dec_3maxplus.c dec_3min.c dec_5100.c dec_maxine.c
Log Message:
Add sr_map entry for IPL_DDB.
Make 3max 64bit clean.
To generate a diff of this commit:
cvs rdiff -u -r1.44.36.2 -r1.44.36.3 src/sys/arch/pmax/pmax/dec_3100.c
cvs rdiff -u -r1.45.36.2 -r1.45.36.3 src/sys/arch/pmax/pmax/dec_3max.c
cvs rdiff -u -r1.58.28.2 -r1.58.28.3 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.60.22.3 -r1.60.22.4 src/sys/arch/pmax/pmax/dec_3min.c
cvs rdiff -u -r1.40.36.1 -r1.40.36.2 src/sys/arch/pmax/pmax/dec_5100.c
cvs rdiff -u -r1.52.28.3 -r1.52.28.4 src/sys/arch/pmax/pmax/dec_maxine.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/pmax/dec_3100.c
diff -u src/sys/arch/pmax/pmax/dec_3100.c:1.44.36.2 src/sys/arch/pmax/pmax/dec_3100.c:1.44.36.3
--- src/sys/arch/pmax/pmax/dec_3100.c:1.44.36.2 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_3100.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.44.36.2 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_3100.c,v 1.44.36.3 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.44.36.2 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.44.36.3 2010/12/29 00:20:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,8 +151,9 @@
[IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
[IPL_SOFTSERIAL] = MIPS_SOFT_INT_MASK,
[IPL_VM] = MIPS_SPL_0_1_2,
- [IPL_SCHED] = MIPS_SPL_0_1_2_3,
- [IPL_HIGH] = MIPS_SPL_0_1_2_3,
+ [IPL_SCHED] = MIPS_SPLHIGH,
+ [IPL_DDB] = MIPS_SPLHIGH,
+ [IPL_HIGH] = MIPS_SPLHIGH,
}
};
Index: src/sys/arch/pmax/pmax/dec_3max.c
diff -u src/sys/arch/pmax/pmax/dec_3max.c:1.45.36.2 src/sys/arch/pmax/pmax/dec_3max.c:1.45.36.3
--- src/sys/arch/pmax/pmax/dec_3max.c:1.45.36.2 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_3max.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.45.36.2 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_3max.c,v 1.45.36.3 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -107,7 +107,9 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.45.36.2 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.45.36.3 2010/12/29 00:20:37 matt Exp $");
+
+#include "dzkbd.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,8 +154,9 @@
[IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
[IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
[IPL_VM] = MIPS_SPL0,
- [IPL_SCHED] = MIPS_SPL_0_1,
- [IPL_HIGH] = MIPS_SPL_0_1,
+ [IPL_SCHED] = MIPS_SPLHIGH,
+ [IPL_DDB] = MIPS_SPLHIGH,
+ [IPL_HIGH] = MIPS_SPLHIGH,
},
};
@@ -258,15 +261,15 @@
int i;
uint32_t csr;
- for (i = 0; i < sizeof(kn02intrs)/sizeof(kn02intrs[0]); i++) {
- if (kn02intrs[i].cookie == (int)cookie)
+ for (i = 0; i < __arraycount(kn02intrs); i++) {
+ if (kn02intrs[i].cookie == (intptr_t)cookie)
goto found;
}
- panic("intr_establish: invalid cookie %d", (int)cookie);
+ panic("intr_establish: invalid cookie %p", cookie);
found:
- intrtab[(int)cookie].ih_func = handler;
- intrtab[(int)cookie].ih_arg = arg;
+ intrtab[(intptr_t)cookie].ih_func = handler;
+ intrtab[(intptr_t)cookie].ih_arg = arg;
csr = *(uint32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_CSR) & 0x00ffff00;
csr |= (kn02intrs[i].intrbit << 16);
@@ -345,7 +348,8 @@
static void
dec_3max_errintr()
{
- uint32_t erradr, errsyn, csr;
+ uint32_t erradr, csr;
+ vaddr_t errsyn;
/* Fetch error address, ECC chk/syn bits, clear interrupt */
erradr = *(uint32_t *)MIPS_PHYS_TO_KSEG1(KN02_SYS_ERRADR);
Index: src/sys/arch/pmax/pmax/dec_3maxplus.c
diff -u src/sys/arch/pmax/pmax/dec_3maxplus.c:1.58.28.2 src/sys/arch/pmax/pmax/dec_3maxplus.c:1.58.28.3
--- src/sys/arch/pmax/pmax/dec_3maxplus.c:1.58.28.2 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_3maxplus.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.58.28.2 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.58.28.3 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -107,7 +107,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.58.28.2 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.58.28.3 2010/12/29 00:20:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,6 +164,7 @@
*/
[IPL_VM] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_0,
[IPL_SCHED] = MIPS_INT_MASK,
+ [IPL_DDB] = MIPS_INT_MASK,
[IPL_HIGH] = MIPS_INT_MASK,
},
};
Index: src/sys/arch/pmax/pmax/dec_3min.c
diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.60.22.3 src/sys/arch/pmax/pmax/dec_3min.c:1.60.22.4
--- src/sys/arch/pmax/pmax/dec_3min.c:1.60.22.3 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_3min.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.60.22.3 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_3min.c,v 1.60.22.4 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -107,7 +107,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.60.22.3 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.60.22.4 2010/12/29 00:20:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,9 +162,10 @@
* since we don't know what kinds of devices are in the
* TURBOchannel option slots, just splhigh().
*/
- [IPL_VM] = MIPS_SPL_0_1_2_3,
- [IPL_SCHED] = MIPS_SPL_0_1_2_3,
- [IPL_HIGH] = MIPS_SPL_0_1_2_3,
+ [IPL_VM] = MIPS_SPLHIGH,
+ [IPL_SCHED] = MIPS_SPLHIGH,
+ [IPL_DDB] = MIPS_SPLHIGH,
+ [IPL_HIGH] = MIPS_SPLHIGH,
},
};
Index: src/sys/arch/pmax/pmax/dec_5100.c
diff -u src/sys/arch/pmax/pmax/dec_5100.c:1.40.36.1 src/sys/arch/pmax/pmax/dec_5100.c:1.40.36.2
--- src/sys/arch/pmax/pmax/dec_5100.c:1.40.36.1 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_5100.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.40.36.1 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_5100.c,v 1.40.36.2 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.40.36.1 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.40.36.2 2010/12/29 00:20:37 matt Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -71,8 +71,9 @@
[IPL_SOFTCLOCK] = MIPS_SOFT_INT_MASK_0,
[IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
[IPL_VM] = MIPS_SPL_0_1,
- [IPL_SCHED] = MIPS_SPL_0_1_2,
- [IPL_HIGH] = MIPS_SPL_0_1_2,
+ [IPL_SCHED] = MIPS_SPLHIGH,
+ [IPL_DDB] = MIPS_SPLHIGH,
+ [IPL_HIGH] = MIPS_SPLHIGH,
},
};
Index: src/sys/arch/pmax/pmax/dec_maxine.c
diff -u src/sys/arch/pmax/pmax/dec_maxine.c:1.52.28.3 src/sys/arch/pmax/pmax/dec_maxine.c:1.52.28.4
--- src/sys/arch/pmax/pmax/dec_maxine.c:1.52.28.3 Fri Dec 24 07:23:42 2010
+++ src/sys/arch/pmax/pmax/dec_maxine.c Wed Dec 29 00:20:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.52.28.3 2010/12/24 07:23:42 matt Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.52.28.4 2010/12/29 00:20:37 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -107,7 +107,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.52.28.3 2010/12/24 07:23:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.52.28.4 2010/12/29 00:20:37 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,6 +161,7 @@
*/
[IPL_VM] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_3,
[IPL_SCHED] = MIPS_INT_MASK,
+ [IPL_DDB] = MIPS_INT_MASK,
[IPL_HIGH] = MIPS_INT_MASK,
},
};
