 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.248 2013/02/05 22:03:16 macallan Exp $ */
+/*	$NetBSD: autoconf.c,v 1.249 2013/02/14 12:14:13 martin Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.248 2013/02/05 22:03:16 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.249 2013/02/14 12:14:13 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_sparc_arch.h"
 #include "scsibus.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
 @@ -1081,104 +1081,110 @@ static int	prom_getprop_address1(int, vo
 /*
  * Attach the mainbus.
+ *
  * Our main job is to attach the CPU (the root node we got in configure())
  * and iterate down the list of `mainbus devices' (children of that node).
  * We also record the `node id' of the default frame buffer, if any.
  */
 static void
 mainbus_attach(device_t parent, device_t dev, void *aux)
+{
 extern struct sparc_bus_dma_tag mainbus_dma_tag;
 extern struct sparc_bus_space_tag mainbus_space_tag;
 	struct boot_special {
 		const char *const dev;
 #define BS_EARLY	1	/* attach device early */
 #define	BS_IGNORE	2	/* ignore root device */
 #define	BS_OPTIONAL	4	/* device not alwas present */
 		unsigned int flags;
 	};
 	struct mainbus_attach_args ma;
 	char namebuf[32];
 #if defined(SUN4C) || defined(SUN4M) || defined(SUN4D)
-	const char *const *ssp, *sp = NULL;
+	const char *sp = NULL;
 	int node0, node;
-	const char *const *openboot_special;
+	const struct boot_special *openboot_special, *ssp;
 #endif
 #if defined(SUN4C)
-	static const char *const openboot_special4c[] = {
+	static const struct boot_special openboot_special4c[] = {
-		/* find these first (end with empty string) */
+		/* find these first */
-		"memory-error",	/* as early as convenient, in case of error */
+		{ "memory-error", BS_EARLY },
-		"eeprom",
+			/* as early as convenient, in case of error */
-		"counter-timer",
+		{ "eeprom", BS_EARLY },
-		"auxiliary-io",
+		{ "counter-timer", BS_EARLY },
-		"",
+		{ "auxiliary-io", BS_EARLY },
-		/* ignore these (end with NULL) */
+		/* ignore these */
-		"aliases",
+		{ "aliases", BS_IGNORE },
-		"interrupt-enable",
+		{ "interrupt-enable", BS_IGNORE },
-		"memory",
+		{ "memory", BS_IGNORE },
-		"openprom",
+		{ "openprom", BS_IGNORE },
-		"options",
+		{ "options", BS_IGNORE },
-		"packages",
+		{ "packages", BS_IGNORE },
-		"virtual-memory",
+		{ "virtual-memory", BS_IGNORE },
 		NULL
 		/* sentinel */
 		{ NULL, 0 }
 	};
 #else
 #define openboot_special4c	((void *)0)
 #endif
 #if defined(SUN4M)
-	static const char *const openboot_special4m[] = {
+	static const struct boot_special openboot_special4m[] = {
 		/* find these first */
-#if !defined(MSIIEP)
+		{ "SUNW,sx", BS_EARLY|BS_OPTIONAL },
-		"SUNW,sx",
+		{ "obio", BS_EARLY|BS_OPTIONAL },
-		"obio",		/* smart enough to get eeprom/etc mapped */
+				/* smart enough to get eeprom/etc mapped */
-#else
+		{ "pci", BS_EARLY|BS_OPTIONAL },	/* ms-IIep */
 		"pci",		/* ms-IIep */
 #endif
 		"",
 		/* ignore these (end with NULL) */
 		/*
 		 * These are _root_ devices to ignore. Others must be handled
 		 * elsewhere.
 		 */
-		"virtual-memory",
+		{ "virtual-memory", BS_IGNORE },
-		"aliases",
+		{ "aliases", BS_IGNORE },
-		"chosen",		/* OpenFirmware */
+		{ "chosen", BS_IGNORE },	/* OpenFirmware */
-		"memory",
+		{ "memory", BS_IGNORE },
-		"openprom",
+		{ "openprom", BS_IGNORE },
-		"options",
+		{ "options", BS_IGNORE },
-		"packages",
+		{ "packages", BS_IGNORE },
-		"udp",			/* OFW in Krups */
+		{ "udp", BS_IGNORE },		/* OFW in Krups */
 		/* we also skip any nodes with device_type == "cpu" */
 		NULL
 		{ NULL, 0 }
 	};
 #else
 #define openboot_special4m	((void *)0)
 #endif
 #if defined(SUN4D)
-	static const char *const openboot_special4d[] = {
+	static const struct boot_special openboot_special4d[] = {
 		"",
 		/* ignore these (end with NULL) */
 		/*
 		 * These are _root_ devices to ignore. Others must be handled
 		 * elsewhere.
 		 */
-		"mem-unit",	/* XXX might need this for memory errors */
+		{ "mem-unit", BS_IGNORE },
-		"boards",
+			/* XXX might need this for memory errors */
-		"openprom",
+		{ "boards", BS_IGNORE },
-		"virtual-memory",
+		{ "openprom", BS_IGNORE },
-		"memory",
+		{ "virtual-memory", BS_IGNORE },
-		"aliases",
+		{ "memory", BS_IGNORE },
-		"options",
+		{ "aliases", BS_IGNORE },
-		"packages",
+		{ "options", BS_IGNORE },
-		NULL
+		{ "packages", BS_IGNORE },
 		{ NULL, 0 }
 	};
 #else
 #define	openboot_special4d	((void *)0)
 #endif
 	if (CPU_ISSUN4)
 		snprintf(machine_model, sizeof machine_model, "SUN-4/%d series",
 		    cpuinfo.classlvl);
 	else
 		snprintf(machine_model, sizeof machine_model, "%s",
 		    prom_getpropstringA(findroot(), "name", namebuf,
 		    sizeof(namebuf)));
 @@ -1272,30 +1278,32 @@ extern struct sparc_bus_space_tag mainbu
 				/* Re-enter loop to find all remaining CPUs */
 				goto rescan;
+			}
+		}
 	} else if (CPU_ISSUN4C) {
 		memset(&ma, 0, sizeof(ma));
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_node = findroot();
 		ma.ma_name = "cpu";
 		config_found(dev, (void *)&ma, mbprint);
+	}
-	for (ssp = openboot_special; *(sp = *ssp) != 0; ssp++) {
+	for (ssp = openboot_special; (sp = ssp->dev) != NULL; ssp++) {
 		struct openprom_addr romreg;
 		if (!(ssp->flags & BS_EARLY)) continue;
 		if ((node = findnode(node0, sp)) == 0) {
 			if (ssp->flags & BS_OPTIONAL) continue;
 			printf("could not find %s in OPENPROM\n", sp);
 			panic(sp);
+		}
 		memset(&ma, 0, sizeof ma);
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_name = prom_getpropstringA(node, "name",
 					    namebuf, sizeof namebuf);
 		ma.ma_node = node;
 		if (prom_getprop_reg1(node, &romreg) != 0)
 			continue;
 @@ -1321,29 +1329,31 @@ extern struct sparc_bus_space_tag mainbu
 		struct openprom_addr romreg;
 		DPRINTF(ACDB_PROBE, ("Node: %x", node));
 #if defined(SUN4M)
 		if (CPU_ISSUN4M) {	/* skip the CPUs */
 			if (strcmp(prom_getpropstringA(node, "device_type",
 						  namebuf, sizeof namebuf),
 				   "cpu") == 0)
 				continue;
+		}
 #endif
 		cp = prom_getpropstringA(node, "name", namebuf, sizeof namebuf);
 		DPRINTF(ACDB_PROBE, (" name %s\n", namebuf));
-		for (ssp = openboot_special; (sp = *ssp) != NULL; ssp++)
+		for (ssp = openboot_special; (sp = ssp->dev) != NULL; ssp++) {
 			if (!(ssp->flags & BS_EARLY)) continue;
 			if (strcmp(cp, sp) == 0)
 				break;
+		}
 		if (sp != NULL)
 			continue; /* an "early" device already configured */
 		memset(&ma, 0, sizeof ma);
 		ma.ma_bustag = &mainbus_space_tag;
 		ma.ma_dmatag = &mainbus_dma_tag;
 		ma.ma_name = prom_getpropstringA(node, "name",
 					    namebuf, sizeof namebuf);
 		ma.ma_node = node;
 #if defined(SUN4M)
 		/*
 		 * JS1/OF does not have iommu node in the device tree,