 @@ -1,14 +1,14 @@
-/* $NetBSD: subr_autoconf.c,v 1.175 2009/05/01 08:27:41 cegger Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.176 2009/05/24 12:27:50 ad Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -67,27 +67,27 @@
  * 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.
+ *
  * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp  (LBL)
+ *
  *	@(#)subr_autoconf.c	8.3 (Berkeley) 5/17/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.175 2009/05/01 08:27:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.176 2009/05/24 12:27:50 ad Exp $");
 #include "opt_ddb.h"
 #include "drvctl.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -163,26 +163,27 @@ struct matchinfo {
 	const int *locs;
 	void	*aux;
 	struct	cfdata *match;
 	int	pri;
 };
 static char *number(char *, int);
 static void mapply(struct matchinfo *, cfdata_t);
 static device_t config_devalloc(const device_t, const cfdata_t, const int *);
 static void config_devdealloc(device_t);
 static void config_makeroom(int, struct cfdriver *);
 static void config_devlink(device_t);
 static void config_devunlink(device_t);
 static void config_twiddle_fn(void *);
 static void pmflock_debug(device_t, const char *, int);
 static void pmflock_debug_with_flags(device_t, const char *, int PMF_FN_PROTO);
 static device_t deviter_next1(deviter_t *);
 static void deviter_reinit(deviter_t *);
 struct deferred_config {
 	TAILQ_ENTRY(deferred_config) dc_queue;
 	device_t dc_dev;
 	void (*dc_func)(device_t);
 };
 @@ -216,26 +217,27 @@ static lwp_t *alldevs_writer = NULL;
 static int config_pending;		/* semaphore for mountroot */
 static kmutex_t config_misc_lock;
 static kcondvar_t config_misc_cv;
 static int detachall = 0;
 #define	STREQ(s1, s2)			\
 	(*(s1) == *(s2) && strcmp((s1), (s2)) == 0)
 static int config_initialized;		/* config_init() has been called. */
 static int config_do_twiddle;
 static callout_t config_twiddle_ch;
 struct vnode *
 opendisk(struct device *dv)
+{
 	int bmajor, bminor;
 	struct vnode *tmpvn;
 	int error;
 	dev_t dev;
 	/*
 	 * Lookup major number for disk block device.
 	 */
 	bmajor = devsw_name2blk(device_xname(dv), NULL, 0);
 @@ -343,26 +345,29 @@ config_init(void)
+{
 	const struct cfattachinit *cfai;
 	int i, j;
 	if (config_initialized)
 		return;
 	mutex_init(&alldevs_mtx, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&alldevs_cv, "alldevs");
 	mutex_init(&config_misc_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&config_misc_cv, "cfgmisc");
 	callout_init(&config_twiddle_ch, CALLOUT_MPSAFE);
 	callout_setfunc(&config_twiddle_ch, config_twiddle_fn, NULL);
 	/* allcfdrivers is statically initialized. */
 	for (i = 0; cfdriver_list_initial[i] != NULL; i++) {
 		if (config_cfdriver_attach(cfdriver_list_initial[i]) != 0)
 			panic("configure: duplicate `%s' drivers",
 			    cfdriver_list_initial[i]->cd_name);
+	}
 	for (cfai = &cfattachinit[0]; cfai->cfai_name != NULL; cfai++) {
 		for (j = 0; cfai->cfai_list[j] != NULL; j++) {
 			if (config_cfattach_attach(cfai->cfai_name,
 						   cfai->cfai_list[j]) != 0)
 				panic("configure: duplicate `%s' attachment "
 				    "of `%s' driver",
 @@ -452,26 +457,32 @@ configure2(void)
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		uvm_cpu_attach(ci);
+	}
 	mp_online = true;
 #if defined(MULTIPROCESSOR)
 	cpu_boot_secondary_processors();
 #endif
 	/* Setup the runqueues and scheduler. */
 	runq_init();
 	sched_init();
 	/*
 	 * Bus scans can make it appear as if the system has paused, so
 	 * twiddle constantly while config_interrupts() jobs are running.
 	 */
 	config_twiddle_fn(NULL);
 	/*
 	 * Create threads to call back and finish configuration for
 	 * devices that want interrupts enabled.
 	 */
 	for (i = 0; i < interrupt_config_threads; i++) {
 		(void)kthread_create(PRI_NONE, 0, NULL,
 		    config_interrupts_thread, NULL, NULL, "config");
+	}
 	/* Get the threads going and into any sleeps before continuing. */
 	yield();
+}
 /*
 @@ -1017,27 +1028,27 @@ config_found_sm_loc(device_t parent,
 		const char *ifattr, const int *locs, void *aux,
 		cfprint_t print, cfsubmatch_t submatch)
+{
 	cfdata_t cf;
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	if ((cf = config_search_loc(submatch, parent, ifattr, locs, aux)))
 		return(config_attach_loc(parent, cf, locs, aux, print));
 	if (print) {
-		if (config_do_twiddle)
+		if (config_do_twiddle && cold)
 			twiddle();
 		aprint_normal("%s", msgs[(*print)(aux, device_xname(parent))]);
+	}
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	return NULL;
+}
 device_t
 @@ -1326,27 +1337,27 @@ config_attach_loc(device_t parent, cfdat
 	/* XXX redundant - see below? */
 	if (cf->cf_fstate != FSTATE_STAR) {
 		KASSERT(cf->cf_fstate == FSTATE_NOTFOUND);
 		cf->cf_fstate = FSTATE_FOUND;
+	}
 #ifdef __BROKEN_CONFIG_UNIT_USAGE
 	  else
 		cf->cf_unit++;
 #endif
 	config_devlink(dev);
-	if (config_do_twiddle)
+	if (config_do_twiddle && cold)
 		twiddle();
 	else
 		aprint_naive("Found ");
 	/*
 	 * We want the next two printfs for normal, verbose, and quiet,
 	 * but not silent (in which case, we're twiddling, instead).
 	 */
 	if (parent == ROOT) {
 		aprint_naive("%s (root)", device_xname(dev));
 		aprint_normal("%s (root)", device_xname(dev));
 	} else {
 		aprint_naive("%s at %s", device_xname(dev), device_xname(parent));
 		aprint_normal("%s at %s", device_xname(dev), device_xname(parent));
 @@ -1827,38 +1838,52 @@ config_finalize(void)
 	config_finalize_done = 1;
 	/* Now free all the hooks. */
 	while ((f = TAILQ_FIRST(&config_finalize_list)) != NULL) {
 		TAILQ_REMOVE(&config_finalize_list, f, f_list);
 		kmem_free(f, sizeof(*f));
+	}
 	KERNEL_UNLOCK_ONE(NULL);
 	errcnt = aprint_get_error_count();
 	if ((boothowto & (AB_QUIET|AB_SILENT)) != 0 &&
 	    (boothowto & AB_VERBOSE) == 0) {
 		mutex_enter(&config_misc_lock);
 		if (config_do_twiddle) {
 			config_do_twiddle = 0;
 			printf_nolog(" done.\n");
+		}
 		mutex_exit(&config_misc_lock);
 		if (errcnt != 0) {
 			printf("WARNING: %d error%s while detecting hardware; "
 			    "check system log.\n", errcnt,
 			    errcnt == 1 ? "" : "s");
+		}
+	}
+}
 void
 config_twiddle_fn(void *cookie)
+{
 	mutex_enter(&config_misc_lock);
 	if (config_do_twiddle) {
 		twiddle();
 		callout_schedule(&config_twiddle_ch, mstohz(100));
+	}
 	mutex_exit(&config_misc_lock);
+}
 /*
  * device_lookup:
+ *
  *	Look up a device instance for a given driver.
  */
 device_t
 device_lookup(cfdriver_t cd, int unit)
+{
 	if (unit < 0 || unit >= cd->cd_ndevs)
 		return NULL;
 	return cd->cd_devs[unit];