svn commit: r240991 - in stable/8/sys: conf dev/random modules/random

[Konstantin Belousov]

Author: kib
Date: Thu Sep 27 10:41:34 2012
New Revision: 240991
URL: http://svn.freebsd.org/changeset/base/240991

Log:
  MFC r229887 (by jkim):
  Enable hardware RNG for VIA Nano processors.

Modified:
  stable/8/sys/conf/files.amd64
  stable/8/sys/dev/random/probe.c
  stable/8/sys/modules/random/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/random/   (props changed)
  stable/8/sys/modules/   (props changed)

Modified: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64	Thu Sep 27 10:30:11 2012	(r240990)
+++ stable/8/sys/conf/files.amd64	Thu Sep 27 10:41:34 2012	(r240991)
@@ -223,6 +223,7 @@ dev/lindev/lindev.c		optional	lindev
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/nve/if_nve.c		optional	nve pci
 dev/nvram/nvram.c		optional	nvram isa
+dev/random/nehemiah.c		optional	random
 dev/sio/sio.c			optional	sio
 dev/sio/sio_isa.c		optional	sio isa
 dev/sio/sio_pccard.c		optional	sio pccard

Modified: stable/8/sys/dev/random/probe.c
==============================================================================
--- stable/8/sys/dev/random/probe.c	Thu Sep 27 10:30:11 2012	(r240990)
+++ stable/8/sys/dev/random/probe.c	Thu Sep 27 10:41:34 2012	(r240991)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stdint.h>
 #include <sys/sysctl.h>
 
-#if defined(__i386__) && !defined(PC98)
+#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
@@ -55,7 +55,7 @@ random_ident_hardware(struct random_syst
 	*systat = random_yarrow;
 
 	/* Then go looking for hardware */
-#if defined(__i386__) && !defined(PC98)
+#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
 	if (via_feature_rng & VIA_HAS_RNG) {
 		*systat = random_nehemiah;
 	}

Modified: stable/8/sys/modules/random/Makefile
==============================================================================
--- stable/8/sys/modules/random/Makefile	Thu Sep 27 10:30:11 2012	(r240990)
+++ stable/8/sys/modules/random/Makefile	Thu Sep 27 10:41:34 2012	(r240991)
@@ -6,7 +6,7 @@
 
 KMOD=	random
 SRCS=	randomdev.c probe.c
-.if ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 SRCS+=	nehemiah.c
 .endif
 SRCS+=	randomdev_soft.c yarrow.c hash.c