Module Name: src
Committed By: thorpej
Date: Tue May 15 01:53:27 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
Log Message:
Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.
N.B. The x86 platforms are sort of a mess, here... legacy indirect
config and ACPI direct config sort of smashed together with the
same config file directives.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.490 -r1.491 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.438 -r1.439 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1177 -r1.1178 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.127 -r1.128 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.86 src/sys/arch/amd64/conf/ALL:1.87
--- src/sys/arch/amd64/conf/ALL:1.86 Tue May 1 16:16:05 2018
+++ src/sys/arch/amd64/conf/ALL Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.86 2018/05/01 16:16:05 maya Exp $
+# $NetBSD: ALL,v 1.87 2018/05/15 01:53:27 thorpej 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.86 $"
+#ident "ALL-$Revision: 1.87 $"
maxusers 64 # estimated number of users
@@ -594,7 +594,7 @@ wbsio* at isa? port 0x2e
wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-ibmhawk0 at iic? addr 0x37
+ibmhawk0 at iic0 addr 0x37
# Intel Integrated Memory Controller SMBus (experimental)
imc* at pci? dev ? function ? # Intel Integrated Memory Controller,
@@ -610,8 +610,8 @@ lm* at wbsio?
smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-smscmon* at iic? addr 0x2c
-smscmon* at iic? addr 0x2d # (alternate address)
+smscmon* at iic0 addr 0x2c
+smscmon* at iic0 addr 0x2d # (alternate address)
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -639,20 +639,20 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool 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
+dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+dbcool* at iic0 addr 0x2D # Tyan S2881
+dbcool* at iic0 addr 0x2E # Tyan S2882-D
# IBM Hawk Integrated Systems Management Processor
-ibmhawk0 at iic? addr 0x37
+ibmhawk0 at iic0 addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
-lm0 at iic? addr 0x2e flags 0x0
+lm0 at iic0 addr 0x2e flags 0x0
# SMSC LPC47M192 hardware monitor
-smscmon* at iic? addr 0x2c
-#smscmon* at iic? addr 0x2d # (alternate address)
+smscmon* at iic0 addr 0x2c
+#smscmon* at iic0 addr 0x2d # (alternate address)
# IBM Thinkpad Active Protection System
aps0 at isa? port 0x1600
@@ -685,22 +685,22 @@ ug0 at isa? port 0xe0
viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules and optional temp sensors
-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
+spdmem* at iic0 addr 0x50
+spdmem* at iic0 addr 0x51
+spdmem* at iic0 addr 0x52
+spdmem* at iic0 addr 0x53
+spdmem* at iic0 addr 0x54
+spdmem* at iic0 addr 0x55
+spdmem* at iic0 addr 0x56
+spdmem* at iic0 addr 0x57
+sdtemp* at iic0 addr 0x18
+sdtemp* at iic0 addr 0x19
+sdtemp* at iic0 addr 0x1a
+sdtemp* at iic0 addr 0x1b
+sdtemp* at iic0 addr 0x1c
+sdtemp* at iic0 addr 0x1d
+sdtemp* at iic0 addr 0x1e
+sdtemp* at iic0 addr 0x1f
# I2C HID devices
ihidev* at iic?
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.490 src/sys/arch/amd64/conf/GENERIC:1.491
--- src/sys/arch/amd64/conf/GENERIC:1.490 Fri May 11 07:44:47 2018
+++ src/sys/arch/amd64/conf/GENERIC Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.490 2018/05/11 07:44:47 maya Exp $
+# $NetBSD: GENERIC,v 1.491 2018/05/15 01:53:27 thorpej 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.490 $"
+#ident "GENERIC-$Revision: 1.491 $"
maxusers 64 # estimated number of users
@@ -485,7 +485,7 @@ amdzentemp* at amdsmnbus? # AMD Ryzen F
#wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-#ibmhawk0 at iic? addr 0x37
+#ibmhawk0 at iic0 addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
@@ -496,8 +496,8 @@ amdzentemp* at amdsmnbus? # AMD Ryzen F
#smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-#smscmon* at iic? addr 0x2c
-#smscmon* at iic? addr 0x2d # (alternate address)
+#smscmon* at iic0 addr 0x2c
+#smscmon* at iic0 addr 0x2d # (alternate address)
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -525,9 +525,9 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# 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
+#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D # Tyan S2881
+#dbcool* at iic0 addr 0x2E # Tyan S2882-D
# IBM Thinkpad Active Protection System
#aps0 at isa? port 0x1600
@@ -542,22 +542,22 @@ iic* at dwiic?
#ug0 at isa? port 0xe0
# 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
+#spdmem* at iic0 addr 0x50
+#spdmem* at iic0 addr 0x51
+#spdmem* at iic0 addr 0x52
+#spdmem* at iic0 addr 0x53
+#spdmem* at iic0 addr 0x54
+#spdmem* at iic0 addr 0x55
+#spdmem* at iic0 addr 0x56
+#spdmem* at iic0 addr 0x57
+#sdtemp* at iic0 addr 0x18
+#sdtemp* at iic0 addr 0x19
+#sdtemp* at iic0 addr 0x1a
+#sdtemp* at iic0 addr 0x1b
+#sdtemp* at iic0 addr 0x1c
+#sdtemp* at iic0 addr 0x1d
+#sdtemp* at iic0 addr 0x1e
+#sdtemp* at iic0 addr 0x1f
# I2C HID devices
ihidev* at iic?
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.149 src/sys/arch/amd64/conf/XEN3_DOM0:1.150
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.149 Sat Feb 17 01:31:01 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.149 2018/02/17 01:31:01 sevan Exp $
+# $NetBSD: XEN3_DOM0,v 1.150 2018/05/15 01:53:27 thorpej Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.149 $"
+#ident "XEN3_DOM0-$Revision: 1.150 $"
maxusers 32 # estimated number of users
@@ -314,27 +314,27 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# 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
+#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D # Tyan S2881
+#dbcool* at iic0 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
+#spdmem* at iic0 addr 0x50
+#spdmem* at iic0 addr 0x51
+#spdmem* at iic0 addr 0x52
+#spdmem* at iic0 addr 0x53
+#spdmem* at iic0 addr 0x54
+#spdmem* at iic0 addr 0x55
+#spdmem* at iic0 addr 0x56
+#spdmem* at iic0 addr 0x57
+#sdtemp* at iic0 addr 0x18
+#sdtemp* at iic0 addr 0x19
+#sdtemp* at iic0 addr 0x1a
+#sdtemp* at iic0 addr 0x1b
+#sdtemp* at iic0 addr 0x1c
+#sdtemp* at iic0 addr 0x1d
+#sdtemp* at iic0 addr 0x1e
+#sdtemp* at iic0 addr 0x1f
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.438 src/sys/arch/i386/conf/ALL:1.439
--- src/sys/arch/i386/conf/ALL:1.438 Tue May 1 16:16:05 2018
+++ src/sys/arch/i386/conf/ALL Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.438 2018/05/01 16:16:05 maya Exp $
+# $NetBSD: ALL,v 1.439 2018/05/15 01:53:27 thorpej 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.438 $"
+#ident "ALL-$Revision: 1.439 $"
maxusers 64 # estimated number of users
@@ -712,20 +712,20 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool 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
+dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+dbcool* at iic0 addr 0x2D # Tyan S2881
+dbcool* at iic0 addr 0x2E # Tyan S2882-D
# IBM Hawk Integrated Systems Management Processor
-ibmhawk0 at iic? addr 0x37
+ibmhawk0 at iic0 addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
-lm0 at iic? addr 0x2e flags 0x0
+lm0 at iic0 addr 0x2e flags 0x0
# SMSC LPC47M192 hardware monitor
-smscmon* at iic? addr 0x2c
-#smscmon* at iic? addr 0x2d # (alternate address)
+smscmon* at iic0 addr 0x2c
+#smscmon* at iic0 addr 0x2d # (alternate address)
# IBM Thinkpad Active Protection System
aps0 at isa? port 0x1600
@@ -758,22 +758,22 @@ ug0 at isa? port 0xe0
viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules and optional temp sensors
-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
+spdmem* at iic0 addr 0x50
+spdmem* at iic0 addr 0x51
+spdmem* at iic0 addr 0x52
+spdmem* at iic0 addr 0x53
+spdmem* at iic0 addr 0x54
+spdmem* at iic0 addr 0x55
+spdmem* at iic0 addr 0x56
+spdmem* at iic0 addr 0x57
+sdtemp* at iic0 addr 0x18
+sdtemp* at iic0 addr 0x19
+sdtemp* at iic0 addr 0x1a
+sdtemp* at iic0 addr 0x1b
+sdtemp* at iic0 addr 0x1c
+sdtemp* at iic0 addr 0x1d
+sdtemp* at iic0 addr 0x1e
+sdtemp* at iic0 addr 0x1f
# I2C HID devices
ihidev* at iic?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1177 src/sys/arch/i386/conf/GENERIC:1.1178
--- src/sys/arch/i386/conf/GENERIC:1.1177 Sun Apr 8 00:52:38 2018
+++ src/sys/arch/i386/conf/GENERIC Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1177 2018/04/08 00:52:38 mrg Exp $
+# $NetBSD: GENERIC,v 1.1178 2018/05/15 01:53:27 thorpej 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.1177 $"
+#ident "GENERIC-$Revision: 1.1178 $"
maxusers 64 # estimated number of users
@@ -660,9 +660,9 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool 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
+#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D # Tyan S2881
+#dbcool* at iic0 addr 0x2E # Tyan S2882-D
# IBM Thinkpad Active Protection System
#aps0 at isa? port 0x1600
@@ -678,7 +678,7 @@ iic* at dwiic?
#wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-#ibmhawk0 at iic? addr 0x37
+#ibmhawk0 at iic0 addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
@@ -689,8 +689,8 @@ iic* at dwiic?
#smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-#smscmon* at iic? addr 0x2c
-#smscmon* at iic? addr 0x2d # (alternate address)
+#smscmon* at iic0 addr 0x2c
+#smscmon* at iic0 addr 0x2d # (alternate address)
# PC87366 hardware monitor
nsclpcsio* at isa?
@@ -702,22 +702,22 @@ nsclpcsio* at isa?
#viaenv* at pci? dev ? function ?
# 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
+#spdmem* at iic0 addr 0x50
+#spdmem* at iic0 addr 0x51
+#spdmem* at iic0 addr 0x52
+#spdmem* at iic0 addr 0x53
+#spdmem* at iic0 addr 0x54
+#spdmem* at iic0 addr 0x55
+#spdmem* at iic0 addr 0x56
+#spdmem* at iic0 addr 0x57
+#sdtemp* at iic0 addr 0x18
+#sdtemp* at iic0 addr 0x19
+#sdtemp* at iic0 addr 0x1a
+#sdtemp* at iic0 addr 0x1b
+#sdtemp* at iic0 addr 0x1c
+#sdtemp* at iic0 addr 0x1d
+#sdtemp* at iic0 addr 0x1e
+#sdtemp* at iic0 addr 0x1f
# I2C HID devices
ihidev* at iic?
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.127 src/sys/arch/i386/conf/XEN3_DOM0:1.128
--- src/sys/arch/i386/conf/XEN3_DOM0:1.127 Sat Feb 17 01:34:45 2018
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue May 15 01:53:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.127 2018/02/17 01:34:45 sevan Exp $
+# $NetBSD: XEN3_DOM0,v 1.128 2018/05/15 01:53:27 thorpej Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -275,27 +275,27 @@ iic* at dwiic?
# 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
+#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D # Tyan S2881
+#dbcool* at iic0 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
+#spdmem* at iic0 addr 0x50
+#spdmem* at iic0 addr 0x51
+#spdmem* at iic0 addr 0x52
+#spdmem* at iic0 addr 0x53
+#spdmem* at iic0 addr 0x54
+#spdmem* at iic0 addr 0x55
+#spdmem* at iic0 addr 0x56
+#spdmem* at iic0 addr 0x57
+#sdtemp* at iic0 addr 0x18
+#sdtemp* at iic0 addr 0x19
+#sdtemp* at iic0 addr 0x1a
+#sdtemp* at iic0 addr 0x1b
+#sdtemp* at iic0 addr 0x1c
+#sdtemp* at iic0 addr 0x1d
+#sdtemp* at iic0 addr 0x1e
+#sdtemp* at iic0 addr 0x1f
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
