Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/arch Pull up following revision(s) (requested by msai...
details: https://anonhg.NetBSD.org/src/rev/f4de88f67e3f
branches: netbsd-7
changeset: 800038:f4de88f67e3f
user: snj <snj%NetBSD.org@localhost>
date: Fri Dec 09 05:10:45 2016 +0000
description:
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).
diffstat:
sys/arch/amd64/conf/ALL | 11 +++++++++--
sys/arch/amd64/conf/GENERIC | 12 ++++++++++--
sys/arch/amd64/conf/XEN3_DOM0 | 24 +++++++++++++++++++++++-
sys/arch/i386/conf/ALL | 11 +++++++++--
sys/arch/i386/conf/GENERIC | 12 ++++++++++--
sys/arch/i386/conf/XEN3_DOM0 | 24 +++++++++++++++++++++++-
6 files changed, 84 insertions(+), 10 deletions(-)
diffs (217 lines):
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/amd64/conf/ALL Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
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 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
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
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 @@
#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
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
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
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/i386/conf/ALL Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
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 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
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
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 @@
#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
diff -r 1bae8774d203 -r f4de88f67e3f sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0 Fri Dec 09 04:56:25 2016 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0 Fri Dec 09 05:10:45 2016 +0000
@@ -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 @@
# 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
Home |
Main Index |
Thread Index |
Old Index