 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_rndq.c,v 1.60 2015/04/14 13:57:35 riastradh Exp $	*/
+/*	$NetBSD: kern_rndq.c,v 1.61 2015/04/14 14:11:51 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org> and Thor Lancelot Simon.
  * This code uses ideas and algorithms from the Linux driver written by
  * Ted Ts'o.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.60 2015/04/14 13:57:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.61 2015/04/14 14:11:51 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 @@ -280,45 +280,26 @@ rnd_getmore(size_t byteswanted)
 		rnd_printf_verbose("rnd: asking source %s for %zu bytes\n",
 		    rs->name, byteswanted);
+	}
 	mutex_spin_exit(&rnd_global.lock);
+}
 /*
  * Check to see if there are readers waiting on us.  If so, kick them.
  */
 static void
 rnd_wakeup_readers(void)
+{
 	/*
 	 * XXX This bookkeeping shouldn't be here -- this is not where
 	 * the rnd_initial_entropy state change actually happens.
 	 */
 	mutex_spin_enter(&rnd_global.lock);
 	const size_t entropy_count = rndpool_get_entropy_count(&rnd_global.pool);
 	if (entropy_count < RND_ENTROPY_THRESHOLD * 8) {
 		mutex_spin_exit(&rnd_global.lock);
 		return;
 	} else {
 #ifdef RND_VERBOSE
 		if (__predict_false(!rnd_initial_entropy))
 			rnd_printf_verbose("rnd: have initial entropy (%zu)\n",
 			    entropy_count);
 #endif
 		rnd_initial_entropy = 1;
 	mutex_spin_exit(&rnd_global.lock);
 	rndsinks_distribute();
+}
 /*
  * Use the timing/value of the event to estimate the entropy gathered.
  * If all the differentials (first, second, and third) are non-zero, return
  * non-zero.  If any of these are zero, return zero.
  */
 static inline uint32_t
 rnd_delta_estimate(rnd_delta_t *d, uint32_t v, int32_t delta)
+{
 	int32_t delta2, delta3;
 @@ -473,26 +454,47 @@ rnd_skew_intr(void *arg)
 	if (RND_ENABLED(&rnd_skew.source)) {
 		if (flipflop) {
 			rnd_add_uint32(&rnd_skew.source, rnd_counter());
 			callout_schedule(&rnd_skew.callout, hz / 10);
 		} else {
 			callout_schedule(&rnd_skew.callout, 1);
+		}
+	}
 	mutex_spin_exit(&rnd_skew.lock);
+}
 #endif
 /*
  * Entropy was just added to the pool.  If we crossed the threshold for
  * the first time, set rnd_initial_entropy = 1.
  */
 static void
 rnd_entropy_added(void)
+{
 	uint32_t pool_entropy;
 	KASSERT(mutex_owned(&rnd_global.lock));
 	if (__predict_true(rnd_initial_entropy))
 		return;
 	pool_entropy = rndpool_get_entropy_count(&rnd_global.pool);
 	if (pool_entropy > RND_ENTROPY_THRESHOLD * NBBY) {
 		rnd_printf_verbose("rnd: have initial entropy (%zu)\n",
 		    pool_entropy);
 		rnd_initial_entropy = 1;
+	}
+}
 /*
  * initialize the global random pool for our use.
  * rnd_init() must be called very early on in the boot process, so
  * the pool is ready for other devices to attach as sources.
  */
 void
 rnd_init(void)
+{
 	uint32_t c;
 	if (rnd_ready)
 		return;
 	/*
 @@ -556,31 +558,28 @@ rnd_init(void)
 	rnd_attach_source(&rnd_skew.source, "callout", RND_TYPE_SKEW,
 	    RND_FLAG_COLLECT_VALUE|RND_FLAG_ESTIMATE_VALUE|
 	    RND_FLAG_HASCB|RND_FLAG_HASENABLE);
 	rnd_skew_intr(NULL);
 #endif
 	rnd_printf_verbose("rnd: initialised (%u)%s", RND_POOLBITS,
 	    c ? " with counter\n" : "\n");
 	if (boot_rsp != NULL) {
 		mutex_spin_enter(&rnd_global.lock);
 		rndpool_add_data(&rnd_global.pool, boot_rsp->data,
 		    sizeof(boot_rsp->data),
 		    MIN(boot_rsp->entropy, RND_POOLBITS / 2));
-		if (rndpool_get_entropy_count(&rnd_global.pool) >
+		rnd_entropy_added();
-		    RND_ENTROPY_THRESHOLD * 8) {
+		mutex_spin_exit(&rnd_global.lock);
                 	rnd_initial_entropy = 1;
                 mutex_spin_exit(&rnd_global.lock);
 		rnd_printf("rnd: seeded with %d bits\n",
 		    MIN(boot_rsp->entropy, RND_POOLBITS / 2));
 		memset(boot_rsp, 0, sizeof(*boot_rsp));
+	}
 	rnd_attach_source(&rnd_printf_source, "printf", RND_TYPE_UNKNOWN,
 			  RND_FLAG_NO_ESTIMATE);
 	rnd_attach_source(&rnd_autoconf_source, "autoconf",
 			  RND_TYPE_UNKNOWN,
 			  RND_FLAG_COLLECT_TIME|RND_FLAG_ESTIMATE_TIME);
 	rnd_ready = 1;
+}
 static rnd_sample_t *
 @@ -1085,26 +1084,27 @@ rnd_process_events(void)
+		}
 		if (source->flags & RND_FLAG_COLLECT_TIME) {
 			rndpool_add_data(&rnd_global.pool, sample->ts,
 					 sample_count *
 					     sizeof(sample->ts[1]),
 );
+		}
 		pool_entropy += entropy;
 		source->total += sample->entropy;
 skip:		SIMPLEQ_INSERT_TAIL(&df_samples, sample, next);
+	}
 	rndpool_set_entropy_count(&rnd_global.pool, pool_entropy);
 	rnd_entropy_added();
 	mutex_spin_exit(&rnd_global.lock);
 	/*
 	 * If we filled the pool past the threshold, wake anyone
 	 * waiting for entropy.  Otherwise, ask all the entropy sources
 	 * for more.
 	 */
 	if (pool_entropy > RND_ENTROPY_THRESHOLD * 8) {
 		wake++;
 	} else {
 		rnd_getmore(howmany((RND_POOLBITS - pool_entropy), NBBY));
 		rnd_printf_verbose("rnd: empty, asking for %d bytes\n",
 		    (int)(howmany((RND_POOLBITS - pool_entropy), NBBY)));
 @@ -1597,26 +1597,27 @@ rnd_system_ioctl(struct file *fp, u_long
 				 * do not flood the pool with entropy such that
 				 * new samples are discarded henceforth.
 				 */
 				estimate = MIN((rnddata->len * NBBY) / 2,
 					       MIN(rnddata->entropy,
 						   RND_POOLBITS / 2));
 			} else {
 				estimate = 0;
+			}
 			mutex_spin_enter(&rnd_global.lock);
 			rndpool_add_data(&rnd_global.pool, rnddata->data,
 					 rnddata->len, estimate);
 			rnd_entropy_added();
 			mutex_spin_exit(&rnd_global.lock);
 			rnd_wakeup_readers();
 		} else {
 			rnd_printf_verbose("rnd"
 			    ": already seeded by boot loader\n");
+		}
 		break;
 	default:
 		return ENOTTY;
+	}