Module Name: src
Committed By: snj
Date: Fri Dec 9 05:10:45 UTC 2016
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf [netbsd-7]: ALL GENERIC XEN3_DOM0
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1297):
sys/arch/amd64/conf/ALL: revision 1.37
sys/arch/amd64/conf/GENERIC: revision 1.436
sys/arch/amd64/conf/XEN3_DOM0: revision 1.120
sys/arch/i386/conf/ALL: revision 1.400
sys/arch/i386/conf/GENERIC: revision 1.1138
sys/arch/i386/conf/XEN3_DOM0: revision 1.99
Add sdtemp(4)
--
Add ichsmb(4), spdmem(4) and sdtemp(4).
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.392.2.7 -r1.392.2.8 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.103.2.4 -r1.103.2.5 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.380.2.2 -r1.380.2.3 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1107.2.8 -r1.1107.2.9 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.85.2.5 -r1.85.2.6 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.13.2.3 src/sys/arch/amd64/conf/ALL:1.13.2.4
--- src/sys/arch/amd64/conf/ALL:1.13.2.3 Fri May 15 03:44:17 2015
+++ src/sys/arch/amd64/conf/ALL Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.13.2.3 2015/05/15 03:44:17 snj Exp $
+# $NetBSD: ALL,v 1.13.2.4 2016/12/09 05:10:45 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.13.2.3 $"
+#ident "ALL-$Revision: 1.13.2.4 $"
maxusers 64 # estimated number of users
@@ -668,6 +668,13 @@ spdmem* at iic? addr 0x55
spdmem* at iic? addr 0x56
spdmem* at iic? addr 0x57
sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
# I2O devices
iop* at pci? dev ? function ? # I/O processor
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.7 src/sys/arch/amd64/conf/GENERIC:1.392.2.8
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.7 Fri May 15 03:44:17 2015
+++ src/sys/arch/amd64/conf/GENERIC Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.7 2015/05/15 03:44:17 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.8 2016/12/09 05:10:45 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.392.2.7 $"
+#ident "GENERIC-$Revision: 1.392.2.8 $"
maxusers 64 # estimated number of users
@@ -515,6 +515,14 @@ iic* at ichsmb?
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# I2O devices
iop* at pci? dev ? function ? # I/O processor
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.5
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 Wed Jul 22 16:53:34 2015
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.103.2.5 2016/12/09 05:10:45 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -299,11 +299,33 @@ amdtemp* at amdnb_misc? # AMD CPU Temp
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
#iic* at amdpm? # sensors below are on this bus
+# Intel ICH SMBus controller
+ichsmb* at pci? dev ? function ?
+iic* at ichsmb?
+
# Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D # Tyan S2881
#dbcool* at iic? addr 0x2E # Tyan S2882-D
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
+
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
#wbsio* at isa? port 0x4e
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.380.2.2 src/sys/arch/i386/conf/ALL:1.380.2.3
--- src/sys/arch/i386/conf/ALL:1.380.2.2 Wed Mar 18 03:57:15 2015
+++ src/sys/arch/i386/conf/ALL Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.380.2.2 2015/03/18 03:57:15 snj Exp $
+# $NetBSD: ALL,v 1.380.2.3 2016/12/09 05:10:45 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.380.2.2 $"
+#ident "ALL-$Revision: 1.380.2.3 $"
maxusers 64 # estimated number of users
@@ -762,6 +762,13 @@ spdmem* at iic? addr 0x55
spdmem* at iic? addr 0x56
spdmem* at iic? addr 0x57
sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
# I2O devices
iop* at pci? dev ? function ? # I/O processor
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.8 src/sys/arch/i386/conf/GENERIC:1.1107.2.9
--- src/sys/arch/i386/conf/GENERIC:1.1107.2.8 Fri Jun 5 16:52:39 2015
+++ src/sys/arch/i386/conf/GENERIC Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1107.2.8 $"
+#ident "GENERIC-$Revision: 1.1107.2.9 $"
maxusers 64 # estimated number of users
@@ -706,6 +706,14 @@ nsclpcsio* at isa?
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# I2O devices
iop* at pci? dev ? function ? # I/O processor
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.5 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.6
--- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.5 Wed Jul 22 16:53:34 2015
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Dec 9 05:10:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.85.2.5 2015/07/22 16:53:34 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.85.2.6 2016/12/09 05:10:45 snj Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -275,12 +275,34 @@ amdtemp* at amdnb_misc? # AMD CPU Temp
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
+# Intel ICH SMBus controller
+ichsmb* at pci? dev ? function ?
+iic* at ichsmb?
+
# dbCool thermal monitor and fan controller
#iic* at amdpm? # sensors below are on this bus
#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D # Tyan S2881
#dbcool* at iic? addr 0x2E # Tyan S2882-D
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
+
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
#wbsio* at isa? port 0x4e
