Module Name: src
Committed By: cliff
Date: Sun Mar 21 21:26:14 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_obio.c
Log Message:
- add use of the 'tmsk' locator
- adapt to new rmixl_intr_establish() args
- establishing the system bridge controller
address error interrupt is now explicitly XLS specific
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/mips/rmi/rmixl_obio.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_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.13 src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.14
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.1.2.13 Sun Jan 24 04:38:28 2010
+++ src/sys/arch/mips/rmi/rmixl_obio.c Sun Mar 21 21:26:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_obio.c,v 1.1.2.13 2010/01/24 04:38:28 cliff Exp $ */
+/* $NetBSD: rmixl_obio.c,v 1.1.2.14 2010/03/21 21:26:13 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.13 2010/01/24 04:38:28 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.1.2.14 2010/03/21 21:26:13 cliff Exp $");
#include "locators.h"
#include "pci.h"
@@ -58,6 +58,7 @@
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
+#include <mips/rmi/rmixl_intr.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixl_pcievar.h>
@@ -136,6 +137,8 @@
aprint_normal(" mult %d", obio->obio_mult);
if (obio->obio_intr != OBIOCF_INTR_DEFAULT)
aprint_normal(" intr %d", obio->obio_intr);
+ if (obio->obio_tmsk != OBIOCF_TMSK_DEFAULT)
+ aprint_normal(" tmsk %d", obio->obio_tmsk);
return (UNCONF);
}
@@ -152,6 +155,7 @@
obio.obio_size = cf->cf_loc[OBIOCF_SIZE];
obio.obio_mult = cf->cf_loc[OBIOCF_MULT];
obio.obio_intr = cf->cf_loc[OBIOCF_INTR];
+ obio.obio_tmsk = cf->cf_loc[OBIOCF_TMSK];
obio.obio_29bit_dmat = sc->sc_29bit_dmat;
obio.obio_32bit_dmat = sc->sc_32bit_dmat;
obio.obio_64bit_dmat = sc->sc_64bit_dmat;
@@ -275,10 +279,12 @@
/*
* establish address error ISR
- * XXX assuming "int 16 (bridge_tb)" is out irq
+ * XXX assuming "int 16 (bridge_tb)" is our irq
+ * XXX is true for XLS family only
*/
- rmixl_intr_establish(16, IPL_HIGH, RMIXL_INTR_LEVEL, RMIXL_INTR_HIGH,
- rmixl_addr_error_intr, NULL);
+ 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);
}
int
