Module Name: src
Committed By: cliff
Date: Mon Apr 12 22:42:07 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_com.c rmixl_obio.c
rmixl_pcie.c rmixl_pcix.c rmixl_usbi.c
Log Message:
- specifiy if mpsafe when establishing interrupts
(all are 'false' except comintr for now)
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/arch/mips/rmi/rmixl_com.c \
src/sys/arch/mips/rmi/rmixl_pcie.c
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/arch/mips/rmi/rmixl_obio.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcix.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/rmi/rmixl_usbi.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/mips/rmi/rmixl_com.c
diff -u src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.11 src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.12
--- src/sys/arch/mips/rmi/rmixl_com.c:1.1.2.11 Sun Mar 21 21:23:32 2010
+++ src/sys/arch/mips/rmi/rmixl_com.c Mon Apr 12 22:42:07 2010
@@ -1,4 +1,4 @@
-/* $Id: rmixl_com.c,v 1.1.2.11 2010/03/21 21:23:32 cliff Exp $ */
+/* $Id: rmixl_com.c,v 1.1.2.12 2010/04/12 22:42:07 cliff Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.11 2010/03/21 21:23:32 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,v 1.1.2.12 2010/04/12 22:42:07 cliff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -286,7 +286,8 @@
com_attach_subr(sc);
rmixl_intr_establish(obio->obio_intr, obio->obio_tmsk,
- IPL_SERIAL, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH, comintr, sc);
+ IPL_SERIAL, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
+ comintr, sc, true);
}
Index: src/sys/arch/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.11 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.12
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.11 Wed Apr 7 19:26:14 2010
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Mon Apr 12 22:42:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.11 2010/04/07 19:26:14 cliff Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.12 2010/04/12 22:42:06 cliff Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.11 2010/04/07 19:26:14 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.12 2010/04/12 22:42:06 cliff Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -782,7 +782,7 @@
case MIPS_XLS408LITE:
sc->sc_fatal_ih = rmixl_intr_establish(29, sc->sc_tmsk,
IPL_HIGH, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_pcie_error_intr, v);
+ rmixl_pcie_error_intr, v, false);
break;
default:
break;
@@ -1300,7 +1300,7 @@
if (lip->enabled == false) {
lip->ih = rmixl_intr_establish(irq, sc->sc_tmsk,
ipl, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_pcie_intr, lip);
+ rmixl_pcie_intr, lip, false);
if (lip->ih == NULL)
panic("%s: cannot establish irq %d", __func__, irq);
Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.14 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.15
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.14 Sun Mar 21 21:26:13 2010
+++ src/sys/arch/mips/rmi/rmixl_obio.c Mon Apr 12 22:42:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.1.2.14 2010/03/21 21:26:13 cliff Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.1.2.15 2010/04/12 22:42:06 cliff Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.14 2010/03/21 21:26:13 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.15 2010/04/12 22:42:06 cliff Exp $");
#include "locators.h"
#include "pci.h"
@@ -283,8 +283,9 @@
* XXX is true for XLS family only
*/
if (cpu_rmixls(mips_options.mips_cpu))
- rmixl_intr_establish(16, 1, IPL_HIGH, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_addr_error_intr, NULL);
+ rmixl_intr_establish(16, 1, IPL_HIGH,
+ RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
+ rmixl_addr_error_intr, NULL, false);
}
int
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.2 Mon Apr 12 22:03:33 2010
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Mon Apr 12 22:42:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.1.2.2 2010/04/12 22:03:33 cliff Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.1.2.3 2010/04/12 22:42:07 cliff Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.1.2.2 2010/04/12 22:03:33 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.1.2.3 2010/04/12 22:42:07 cliff Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -482,13 +482,13 @@
sc->sc_ih = rmixl_intr_establish(16, sc->sc_tmsk,
IPL_VM, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_pcix_intr, sc);
+ rmixl_pcix_intr, sc, false);
if (sc->sc_ih == NULL)
panic("%s: cannot establish irq %d", __func__, 16);
sc->sc_fatal_ih = rmixl_intr_establish(24, sc->sc_tmsk,
IPL_VM, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_pcix_error_intr, sc);
+ rmixl_pcix_error_intr, sc, false);
if (sc->sc_fatal_ih == NULL)
panic("%s: cannot establish irq %d", __func__, 24);
Index: src/sys/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.4 src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.5
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.4 Sun Mar 21 21:30:16 2010
+++ src/sys/arch/mips/rmi/rmixl_usbi.c Mon Apr 12 22:42:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbi.c,v 1.1.2.4 2010/03/21 21:30:16 cliff Exp $ */
+/* $NetBSD: rmixl_usbi.c,v 1.1.2.5 2010/04/12 22:42:07 cliff Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.1.2.4 2010/03/21 21:30:16 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.1.2.5 2010/04/12 22:42:07 cliff Exp $");
#include "locators.h"
@@ -175,7 +175,7 @@
/* establish interrupt */
ih = rmixl_intr_establish(obio->obio_intr, obio->obio_tmsk,
IPL_USB, RMIXL_TRIG_LEVEL, RMIXL_POLR_HIGH,
- rmixl_usbi_intr, sc);
+ rmixl_usbi_intr, sc, false);
if (ih == NULL)
panic("%s: couldn't establish interrupt", device_xname(self));
