[src/trunk]: src/sys/kern Squash "holding up boot" messages into a single lin...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac307c6a0c3b
branches:  trunk
changeset: 1024153:ac307c6a0c3b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Oct 11 10:59:09 2021 +0000

description:
Squash "holding up boot" messages into a single line, and only print the
device list if no progress has been made in 1 second.

diffstat:

 sys/kern/subr_autoconf.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r bb2eaf676892 -r ac307c6a0c3b sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Mon Oct 11 10:23:02 2021 +0000
+++ b/sys/kern/subr_autoconf.c  Mon Oct 11 10:59:09 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.289 2021/08/07 16:19:18 thorpej Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.290 2021/10/11 10:59:09 jmcneill Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.289 2021/08/07 16:19:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.290 2021/10/11 10:59:09 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -2406,9 +2406,16 @@
        mutex_enter(&config_misc_lock);
        while (!TAILQ_EMPTY(&config_pending)) {
                device_t dev;
-               TAILQ_FOREACH(dev, &config_pending, dv_pending_list)
-                       aprint_debug_dev(dev, "holding up boot\n");
-               cv_wait(&config_misc_cv, &config_misc_lock);
+               int error;
+
+               error = cv_timedwait(&config_misc_cv, &config_misc_lock,
+                   mstohz(1000));
+               if (error == EWOULDBLOCK) {
+                       aprint_debug("waiting for devices:");
+                       TAILQ_FOREACH(dev, &config_pending, dv_pending_list)
+                               aprint_debug(" %s", device_xname(dev));
+                       aprint_debug("\n");
+               }
        }
        mutex_exit(&config_misc_lock);