From d1f9cb6c18a64c6ca7fbd7e116a62e7f454ade4f Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Sat, 8 Jul 2023 12:19:36 +0000
Subject: [PATCH] autoconf(9): Print `waiting for devices' normally once a
 minute.

---
 sys/kern/subr_autoconf.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index e1d463029110..22ae455f3322 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -2690,6 +2690,7 @@ config_finalize(void)
 	struct finalize_hook *f;
 	struct pdevinit *pdev;
 	extern struct pdevinit pdevinit[];
+	unsigned t0 = getticks();
 	int errcnt, rv;
 
 	/*
@@ -2698,17 +2699,27 @@ config_finalize(void)
 	 */
 	mutex_enter(&config_misc_lock);
 	while (!TAILQ_EMPTY(&config_pending)) {
-		device_t dev;
-		int error;
+		const unsigned t1 = getticks();
 
-		error = cv_timedwait(&config_misc_cv, &config_misc_lock,
-		    mstohz(1000));
-		if (error == EWOULDBLOCK) {
-			aprint_debug("waiting for devices:");
+		if (t1 - t0 >= hz) {
+			void (*pr)(const char *, ...) __printflike(1,2);
+			device_t dev;
+
+			if (t1 - t0 >= 60*hz) {
+				pr = aprint_normal;
+				t0 = t1;
+			} else {
+				pr = aprint_debug;
+			}
+
+			(*pr)("waiting for devices:");
 			TAILQ_FOREACH(dev, &config_pending, dv_pending_list)
-				aprint_debug(" %s", device_xname(dev));
-			aprint_debug("\n");
+				(*pr)(" %s", device_xname(dev));
+			(*pr)("\n");
 		}
+
+		(void)cv_timedwait(&config_misc_cv, &config_misc_lock,
+		    mstohz(1000));
 	}
 	mutex_exit(&config_misc_lock);