[src/trunk]: src/sys/dev/pci Defer to a callout in hifn_rng_get. Fixes lock-...

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

details:   https://anonhg.NetBSD.org/src/rev/ea27ebc6d538
branches:  trunk
changeset: 338086:ea27ebc6d538
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat May 09 21:57:56 2015 +0000

description:
Defer to a callout in hifn_rng_get.  Fixes lock-against-self.

Still can't call rnd_add_data directly from an rndsource callback.

(Still plan to fix this with further rnd rototilling.)

XXX pullup netbsd-7

diffstat:

 sys/dev/pci/hifn7751.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r a82f6852f28d -r ea27ebc6d538 sys/dev/pci/hifn7751.c
--- a/sys/dev/pci/hifn7751.c    Sat May 09 21:54:35 2015 +0000
+++ b/sys/dev/pci/hifn7751.c    Sat May 09 21:57:56 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hifn7751.c,v 1.59 2015/05/09 08:08:50 mrg Exp $        */
+/*     $NetBSD: hifn7751.c,v 1.60 2015/05/09 21:57:56 riastradh Exp $  */
 /*     $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*     $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $  */
 
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.59 2015/05/09 08:08:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.60 2015/05/09 21:57:56 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -538,8 +538,7 @@
 
        mutex_enter(&sc->sc_mtx);
        sc->sc_rng_need = bytes;
-
-       hifn_rng_locked(sc);
+       callout_reset(&sc->sc_rngto, 0, hifn_rng, sc);
        mutex_exit(&sc->sc_mtx);
 }