Drop the ipl locator from syscon attachments, and have the syscon children

request explicit IPL_xxx levels.

Fix VME Ethernet config stanzas to request IPL_NET.

7 files changed, 35 insertions, 41 deletions

diff --git a/sys/arch/aviion/conf/AV400 b/sys/arch/aviion/conf/AV400
index 702fadb09e7..b508ff63567 100644
--- a/sys/arch/aviion/conf/AV400
+++ b/sys/arch/aviion/conf/AV400
@@ -1,4 +1,4 @@
-#	$OpenBSD: AV400,v 1.2 2006/05/20 12:06:18 miod Exp $
+#	$OpenBSD: AV400,v 1.3 2013/09/16 16:30:50 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -36,7 +36,7 @@ mainbus0 at root
 
 syscon0 at mainbus0 addr 0xfff00000
 nvram0	at syscon? offset 0x80000
-dart0	at syscon? offset 0x82000 ipl 3		# serial ports
+dart0	at syscon? offset 0x82000		# serial ports
 #avkbd0	at syscon? offset 0x82800
 #wskbd*	at avkbd?
 #avfb0	at syscon? offset 0x89000
@@ -45,17 +45,17 @@ dart0	at syscon? offset 0x82000 ipl 3		# serial ports
 # AV400 onboard devices
 #
 
-dart1	at syscon? offset 0x82c00 ipl 3
+dart1	at syscon? offset 0x82c00
 vme0	at syscon? offset 0x85000		# VME bridge
-#aic0	at syscon? offset 0x8a000 ipl 2
-le0	at syscon? offset 0x8c000 ipl 1		# on-board ethernet
+#aic0	at syscon? offset 0x8a000
+le0	at syscon? offset 0x8c000		# on-board ethernet
 
 #
 # VME devices
 #
 
 # Interphase Hawk Ethernet
-le*	at vme? a32 0x00900000 a16 0x4000 ipl 1	# artwork X0A factory settings
-le*	at vme? a32 0x55540000 a16 0x8600 ipl 1	# artwork X0B factory settings
-le*	at vme? a32 0x55900000 a16 0x4000 ipl 1
-le*	at vme? a32 0x55980000 a16 0x5000 ipl 1
+le*	at vme? a32 0x00900000 a16 0x4000 ipl 3	# artwork X0A factory settings
+le*	at vme? a32 0x55540000 a16 0x8600 ipl 3	# artwork X0B factory settings
+le*	at vme? a32 0x55900000 a16 0x4000 ipl 3
+le*	at vme? a32 0x55980000 a16 0x5000 ipl 3
diff --git a/sys/arch/aviion/conf/GENERIC b/sys/arch/aviion/conf/GENERIC
index 9ae6549b85b..379faee26f7 100644
--- a/sys/arch/aviion/conf/GENERIC
+++ b/sys/arch/aviion/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.7 2011/06/29 20:52:09 matthew Exp $
+#	$OpenBSD: GENERIC,v 1.8 2013/09/16 16:30:50 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -40,7 +40,7 @@ mainbus0 at root
 
 syscon0 at mainbus0 addr 0xfff00000
 nvram0	at syscon? offset 0x80000
-dart0	at syscon? offset 0x82000 ipl 3		# serial ports
+dart0	at syscon? offset 0x82000		# serial ports
 #avkbd0	at syscon? offset 0x82800
 #wskbd*	at avkbd?
 #avfb0	at syscon? offset 0x89000
@@ -49,35 +49,35 @@ dart0	at syscon? offset 0x82000 ipl 3		# serial ports
 # AV400 onboard devices
 #
 
-dart1	at syscon? offset 0x82c00 ipl 3
+dart1	at syscon? offset 0x82c00
 vme0	at syscon? offset 0x85000		# VME bridge
-#aic0	at syscon? offset 0x8a000 ipl 2
-le0	at syscon? offset 0x8c000 ipl 1		# on-board ethernet
+#aic0	at syscon? offset 0x8a000
+le0	at syscon? offset 0x8c000		# on-board ethernet
 
 #
 # AV530 onboard devices
 #
 
-dart1	at syscon? offset 0x82040 ipl 3
-#ssi0	at syscon? offset 0x8d000 ipl 3
-oosiop0	at syscon? offset 0xb0000 ipl 2
-oosiop1	at syscon? offset 0xb0080 ipl 2
-#ile0	at syscon? offset 0xb00c0 ipl 1
-#ile1	at syscon? offset 0xb0140 ipl 1
+dart1	at syscon? offset 0x82040
+#ssi0	at syscon? offset 0x8d000
+oosiop0	at syscon? offset 0xb0000
+oosiop1	at syscon? offset 0xb0080
+#ile0	at syscon? offset 0xb00c0
+#ile1	at syscon? offset 0xb0140
 
 #
 # VME devices
 #
 
 # Interphase Hawk Ethernet
-le*	at vme? a32 0x00900000 a16 0x4000 ipl 1	# artwork X0A factory settings
-le*	at vme? a32 0x55540000 a16 0x8600 ipl 1	# artwork X0B factory settings
-le*	at vme? a32 0x55900000 a16 0x4000 ipl 1
-le*	at vme? a32 0x55980000 a16 0x5000 ipl 1
+le*	at vme? a32 0x00900000 a16 0x4000 ipl 3	# artwork X0A factory settings
+le*	at vme? a32 0x55540000 a16 0x8600 ipl 3	# artwork X0B factory settings
+le*	at vme? a32 0x55900000 a16 0x4000 ipl 3
+le*	at vme? a32 0x55980000 a16 0x5000 ipl 3
 
 # AV5000 VME Ethernet
-#ile*	at vme? a32 0x55900000 a16 0x4000 ipl 1
-#ile*	at vme? a32 0x55980000 a16 0x5000 ipl 1
+#ile*	at vme? a32 0x55900000 a16 0x4000 ipl 3
+#ile*	at vme? a32 0x55980000 a16 0x5000 ipl 3
 
 # VDA/255 Serial Host Adapter (on-board on model 4300)
 #vda0	at vme? a32 0x60000000
diff --git a/sys/arch/aviion/conf/files.aviion b/sys/arch/aviion/conf/files.aviion
index c4f5fa50f0d..c7046846536 100644
--- a/sys/arch/aviion/conf/files.aviion
+++ b/sys/arch/aviion/conf/files.aviion
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.aviion,v 1.9 2010/12/31 21:38:07 miod Exp $
+#	$OpenBSD: files.aviion,v 1.10 2013/09/16 16:30:50 miod Exp $
 #
 maxpartitions 16
 
@@ -10,7 +10,7 @@ file	arch/aviion/dev/mainbus.c
 # On-board devices
 #
 
-device	syscon {[offset = -1], [ipl = 0]}
+device	syscon {[offset = -1]}
 attach	syscon at mainbus
 file	arch/aviion/dev/syscon.c			syscon needs-flag
 
diff --git a/sys/arch/aviion/dev/dart_syscon.c b/sys/arch/aviion/dev/dart_syscon.c
index a237480a251..06dcd1da55a 100644
--- a/sys/arch/aviion/dev/dart_syscon.c
+++ b/sys/arch/aviion/dev/dart_syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart_syscon.c,v 1.3 2007/12/19 22:05:06 miod Exp $	*/
+/*	$OpenBSD: dart_syscon.c,v 1.4 2013/09/16 16:30:50 miod Exp $	*/
 /*
  * Copyright (c) 2006, Miodrag Vallat
  *
@@ -72,9 +72,6 @@ dart_syscon_attach(struct device *parent, struct device *self, void *aux)
 	bus_space_handle_t ioh;
 	u_int intsrc;
 
-	if (ca->ca_ipl < 0)
-		ca->ca_ipl = IPL_TTY;
-
 	sc->sc_iot = ca->ca_iot;
 	if (bus_space_map(sc->sc_iot, ca->ca_paddr, DART_SIZE, 0, &ioh) != 0) {
 		printf(": can't map registers!\n");
@@ -95,7 +92,7 @@ dart_syscon_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih.ih_fn = dartintr;
 	sc->sc_ih.ih_arg = sc;
 	sc->sc_ih.ih_flags = 0;
-	sc->sc_ih.ih_ipl = ca->ca_ipl;
+	sc->sc_ih.ih_ipl = IPL_TTY;
 
 	sysconintr_establish(intsrc, &sc->sc_ih, self->dv_xname);
 
diff --git a/sys/arch/aviion/dev/if_le_syscon.c b/sys/arch/aviion/dev/if_le_syscon.c
index 5c19dfdf4c3..22510896ec1 100644
--- a/sys/arch/aviion/dev/if_le_syscon.c
+++ b/sys/arch/aviion/dev/if_le_syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_syscon.c,v 1.12 2011/04/07 15:30:15 miod Exp $	*/
+/*	$OpenBSD: if_le_syscon.c,v 1.13 2013/09/16 16:30:51 miod Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@ le_syscon_attach(struct device *parent, struct device *self, void *aux)
 	lesc->sc_ih.ih_fn = le_syscon_intr;
 	lesc->sc_ih.ih_arg = sc;
 	lesc->sc_ih.ih_flags = 0;
-	lesc->sc_ih.ih_ipl = ca->ca_ipl;
+	lesc->sc_ih.ih_ipl = IPL_NET;
 
 	sysconintr_establish(INTSRC_ETHERNET1, &lesc->sc_ih, self->dv_xname);
 }
diff --git a/sys/arch/aviion/dev/oosiop_syscon.c b/sys/arch/aviion/dev/oosiop_syscon.c
index e2ec0f46ce0..64d4864b7bf 100644
--- a/sys/arch/aviion/dev/oosiop_syscon.c
+++ b/sys/arch/aviion/dev/oosiop_syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop_syscon.c,v 1.4 2011/04/07 15:30:15 miod Exp $	*/
+/*	$OpenBSD: oosiop_syscon.c,v 1.5 2013/09/16 16:30:51 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -111,7 +111,7 @@ oosiop_syscon_attach(struct device *parent, struct device *self, void *aux)
 	ssc->sc_ih.ih_fn = (int(*)(void *))oosiop_intr;
 	ssc->sc_ih.ih_arg = sc;
 	ssc->sc_ih.ih_flags = 0;
-	ssc->sc_ih.ih_ipl = ca->ca_ipl;
+	ssc->sc_ih.ih_ipl = IPL_BIO;
 	intsrc = ca->ca_paddr == AV530_SCSI1 ? INTSRC_SCSI1 : INTSRC_SCSI2;
 	sysconintr_establish(intsrc, &ssc->sc_ih, self->dv_xname);
 }
diff --git a/sys/arch/aviion/dev/syscon.c b/sys/arch/aviion/dev/syscon.c
index 131525d9a6d..87b38f084f4 100644
--- a/sys/arch/aviion/dev/syscon.c
+++ b/sys/arch/aviion/dev/syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscon.c,v 1.6 2010/09/20 06:33:47 matthew Exp $ */
+/*	$OpenBSD: syscon.c,v 1.7 2013/09/16 16:30:51 miod Exp $ */
 /*
  * Copyright (c) 2007 Miodrag Vallat.
  *
@@ -138,7 +138,6 @@ syscon_scan(struct device *parent, void *child, void *args)
 		oca.ca_paddr = ca->ca_paddr + oca.ca_offset;
 	else
 		oca.ca_paddr = (paddr_t)-1;
-	oca.ca_ipl = (u_int)cf->cf_loc[1];
 
 	if ((*cf->cf_attach->ca_match)(parent, cf, &oca) == 0)
 		return (0);
@@ -154,8 +153,6 @@ syscon_print(void *args, const char *pnp)
 
 	if (ca->ca_offset != (paddr_t)-1)
 		printf(" offset 0x%x", ca->ca_offset);
-	if (ca->ca_ipl != (u_int)-1)
-		printf(" ipl %u", ca->ca_ipl);
 	return (UNCONF);
 }