[src/netbsd-3]: src/sys/arch Pull up following revision(s) (requested by tls ...

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

details:   https://anonhg.NetBSD.org/src/rev/cf164a086a9f
branches:  netbsd-3
changeset: 577851:cf164a086a9f
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Feb 20 23:09:00 2006 +0000

description:
Pull up following revision(s) (requested by tls in ticket #1180):
        sys/arch/amd64/conf/GENERIC: revision 1.87
        sys/arch/i386/conf/GENERIC: revision 1.727
Add amdpm -- without this, we're throwing away a good hardware random
number source on a huge set of machines.  Also, now that amdpm has
support for the SMBus controller, add (commented-out, since we don't
always know what address the sensors are at) iic at amdpm and adt7463c
at iic, which is the configuration used on the Tyan S2881 and S2882-D
server boards.  This should work in either 64-bit or 32-bit mode; it's
been tested in 64-bit mode.  Addresses PR kern/32463 submitted by
Anil Gopinath.

diffstat:

 sys/arch/amd64/conf/GENERIC |  11 +++++++++--
 sys/arch/i386/conf/GENERIC  |  11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 947d06980d3a -r cf164a086a9f sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Feb 20 23:00:26 2006 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Feb 20 23:09:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42.2.7 2005/09/15 23:33:43 snj Exp $
+# $NetBSD: GENERIC,v 1.42.2.8 2006/02/20 23:09:00 tron Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.42.2.7 $"
+#ident                 "GENERIC-$Revision: 1.42.2.8 $"
 
 maxusers       32              # estimated number of users
 
@@ -355,6 +355,13 @@
 # LM7[89] and compatible hardware monitors
 #lm0   at isa? port 0x290              # other common ports: 0x280, 0x310
 
+# AMD 768 and 8111 power/ACPI controllers
+amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface
+#iic*  at amdpm?                       # sensors below are on this bus
+#adt7463c* at iic? addr 0x2C           # Unknown other motherboard(s)
+#adt7463c* at iic? addr 0x2D           # Tyan S2881
+#adt7463c* at iic? addr 0x2E            # Tyan S2882-D
+
 # I2O devices
 iop*   at pci? dev ? function ?        # I/O processor
 iopsp* at iop? tid ?                   # SCSI/FC-AL ports
diff -r 947d06980d3a -r cf164a086a9f sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Feb 20 23:00:26 2006 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Feb 20 23:09:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.661.2.8 2005/10/28 20:12:42 jmc Exp $
+# $NetBSD: GENERIC,v 1.661.2.9 2006/02/20 23:09:01 tron Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.661.2.8 $"
+#ident                 "GENERIC-$Revision: 1.661.2.9 $"
 
 maxusers       32              # estimated number of users
 
@@ -557,6 +557,13 @@
 
 # Hardware monitors
 
+# AMD 768 and 8111 power/ACPI controllers
+amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface
+#iic*  at amdpm?                       # sensors below are on this bus
+#adt7463c* at iic? addr 0x2C           # Unknown other motherboard(s)
+#adt7463c* at iic? addr 0x2D           # Tyan S2881
+#adt7463c* at iic? addr 0x2E           # Tyan S2882-D
+
 # LM7[89] and compatible hardware monitors
 #lm0   at isa? port 0x290              # other common ports: 0x280, 0x310