[src/trunk]: src New wbsio(4) driver for Winbond Super I/O attachment of lm(4...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src New wbsio(4) driver for Winbond Super I/O attachment of lm(4...
From: cnst <cnst%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:35:33 +0000
details:   https://anonhg.NetBSD.org/src/rev/752521fc5eb6
branches:  trunk
changeset: 752251:752521fc5eb6
user:      cnst <cnst%NetBSD.org@localhost>
date:      Sun Feb 21 05:16:29 2010 +0000

description:
New wbsio(4) driver for Winbond Super I/O attachment of lm(4) on any port.

    http://mail-index.netbsd.org/tech-kern/2010/02/17/msg007338.html

Reviewed by <pgoyette>, <tech-kern>.

diffstat:

 distrib/sets/lists/man/mi     |    5 +-
 share/man/man4/Makefile       |    6 +-
 share/man/man4/isa.4          |    5 +-
 share/man/man4/lm.4           |    6 +-
 share/man/man4/wbsio.4        |   58 ++++++++++
 sys/arch/amd64/conf/GENERIC   |    9 +-
 sys/arch/amd64/conf/XEN3_DOM0 |    7 +-
 sys/arch/i386/conf/ALL        |    9 +-
 sys/arch/i386/conf/GENERIC    |    9 +-
 sys/arch/i386/conf/XEN3_DOM0  |    7 +-
 sys/dev/isa/files.isa         |   11 +-
 sys/dev/isa/lm_isa.c          |    7 +-
 sys/dev/isa/wbsio.c           |  236 ++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 355 insertions(+), 20 deletions(-)

diffs (truncated from 619 to 300 lines):

diff -r 1fb1cf37457d -r 752521fc5eb6 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sun Feb 21 04:00:47 2010 +0000
+++ b/distrib/sets/lists/man/mi Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1192 2010/02/21 03:18:46 darran Exp $
+# $NetBSD: mi,v 1.1193 2010/02/21 05:16:29 cnst Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1684,6 +1684,7 @@
 ./usr/share/man/cat4/vr.0                      man-sys-catman          .cat
 ./usr/share/man/cat4/wapbl.0                   man-sys-catman          .cat
 ./usr/share/man/cat4/wb.0                      man-sys-catman          .cat
+./usr/share/man/cat4/wbsio.0                   man-sys-catman          .cat
 ./usr/share/man/cat4/wd.0                      man-sys-catman          .cat
 ./usr/share/man/cat4/wdc.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/wds.0                     man-sys-catman          .cat
@@ -4248,6 +4249,7 @@
 ./usr/share/man/html4/vr.html                  man-sys-htmlman         html
 ./usr/share/man/html4/wapbl.html               man-sys-htmlman         html
 ./usr/share/man/html4/wb.html                  man-sys-htmlman         html
+./usr/share/man/html4/wbsio.html               man-sys-htmlman         html
 ./usr/share/man/html4/wd.html                  man-sys-htmlman         html
 ./usr/share/man/html4/wdc.html                 man-sys-htmlman         html
 ./usr/share/man/html4/wds.html                 man-sys-htmlman         html
@@ -6750,6 +6752,7 @@
 ./usr/share/man/man4/vr.4                      man-sys-man             .man
 ./usr/share/man/man4/wapbl.4                   man-sys-man             .man
 ./usr/share/man/man4/wb.4                      man-sys-man             .man
+./usr/share/man/man4/wbsio.4                   man-sys-man             .man
 ./usr/share/man/man4/wd.4                      man-sys-man             .man
 ./usr/share/man/man4/wdc.4                     man-sys-man             .man
 ./usr/share/man/man4/wds.4                     man-sys-man             .man
diff -r 1fb1cf37457d -r 752521fc5eb6 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Sun Feb 21 04:00:47 2010 +0000
+++ b/share/man/man4/Makefile   Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.504 2010/02/09 03:19:50 cnst Exp $
+#      $NetBSD: Makefile,v 1.505 2010/02/21 05:16:29 cnst Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \
@@ -59,8 +59,8 @@
        ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 unix.4 userconf.4 \
        veriexec.4 vga.4 vge.4 viaide.4 video.4 vlan.4 vmmon.4 vmnet.4 \
        vnd.4 vr.4 \
-       wapbl.4 wb.4 wd.4 wdc.4 wi.4 wm.4 wpi.4 wscons.4 wsdisplay.4 wsfont.4 \
-       wskbd.4 wsmouse.4 wsmux.4 \
+       wapbl.4 wb.4 wbsio.4 wd.4 wdc.4 wi.4 wm.4 wpi.4 \
+       wscons.4 wsdisplay.4 wsfont.4 wskbd.4 wsmouse.4 wsmux.4 \
        xbox.4 xge.4 \
        yds.4 ym.4 \
        zero.4 zstty.4 zyd.4
diff -r 1fb1cf37457d -r 752521fc5eb6 share/man/man4/isa.4
--- a/share/man/man4/isa.4      Sun Feb 21 04:00:47 2010 +0000
+++ b/share/man/man4/isa.4      Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: isa.4,v 1.40 2006/12/23 06:58:20 wiz Exp $
+.\"    $NetBSD: isa.4,v 1.41 2010/02/21 05:16:29 cnst Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -276,6 +276,8 @@
 controllers.
 .It vga
 VGA graphics boards.
+.It wbsio
+Winbond LPC Super I/O.
 .El
 .Pp
 Note that some
@@ -370,6 +372,7 @@
 .Xr tr 4 ,
 .Xr uha 4 ,
 .Xr vga 4 ,
+.Xr wbsio 4 ,
 .Xr wd 4 ,
 .Xr wdc 4 ,
 .Xr wds 4 ,
diff -r 1fb1cf37457d -r 752521fc5eb6 share/man/man4/lm.4
--- a/share/man/man4/lm.4       Sun Feb 21 04:00:47 2010 +0000
+++ b/share/man/man4/lm.4       Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: lm.4,v 1.31 2010/02/12 10:54:53 njoly Exp $
+.\"    $NetBSD: lm.4,v 1.32 2010/02/21 05:16:29 cnst Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 8, 2010
+.Dd February 16, 2010
 .Dt LM 4
 .Os
 .Sh NAME
@@ -40,6 +40,7 @@
 .Cd "lm3 at isa? port 0xa00 flags 0x00"
 .Cd "lm0 at pnpbios0 index ? flags 0x00"
 .Cd "lm0 at iic? addr 0x2e flags 0x00"
+.Cd "lm* at wbsio?"
 .Sh DESCRIPTION
 The
 .Nm
@@ -116,6 +117,7 @@
 .El
 .Sh SEE ALSO
 .Xr envsys 4 ,
+.Xr wbsio 4 ,
 .Xr envstat 8
 .Sh HISTORY
 The
diff -r 1fb1cf37457d -r 752521fc5eb6 share/man/man4/wbsio.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/wbsio.4    Sun Feb 21 05:16:29 2010 +0000
@@ -0,0 +1,58 @@
+.\"    $NetBSD: wbsio.4,v 1.1 2010/02/21 05:16:29 cnst Exp $
+.\"    $OpenBSD: wbsio.4,v 1.2 2008/02/17 16:48:47 jmc Exp $
+.\"
+.\" Copyright (c) 2008 Mark Kettenis <kettenis%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd February 16, 2010
+.Dt WBSIO 4
+.Os
+.Sh NAME
+.Nm wbsio
+.Nd Winbond LPC Super I/O
+.Sh SYNOPSIS
+.Cd "wbsio* at isa? port 0x2e"
+.Cd "wbsio* at isa? port 0x4e"
+.Cd "lm* at wbsio?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Winbond LPC Super I/O ICs.
+Only the hardware monitoring function is currently supported.
+.Pp
+Support for the hardware monitor function is provided through the
+.Xr lm 4
+driver.
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr isa 4 ,
+.Xr lm 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 4.3 .
+.Nx
+support was added in
+.Nx 6.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Mark Kettenis Aq kettenis%openbsd.org@localhost .
+It was adapted to
+.Nx
+by
+.An Constantine A. Murenin Aq cnst%NetBSD.org@localhost .
diff -r 1fb1cf37457d -r 752521fc5eb6 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Feb 21 04:00:47 2010 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.266 2010/02/09 03:19:50 cnst Exp $
+# $NetBSD: GENERIC,v 1.267 2010/02/21 05:16:29 cnst Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.266 $"
+#ident                 "GENERIC-$Revision: 1.267 $"
 
 maxusers       64              # estimated number of users
 
@@ -422,9 +422,14 @@
 
 amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
 
+# Winbond LPC Super I/O
+#wbsio*        at isa? port 0x2e
+#wbsio*        at isa? port 0x4e
+
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
 #lm0   at isa? port 0x290 flags 0x0    # other common ports: 0x280, 0x310
+#lm*   at wbsio?
 
 # SMSC LPC47B397 hardware monitor functions
 #smsc0   at isa? port 0x02e
diff -r 1fb1cf37457d -r 752521fc5eb6 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sun Feb 21 04:00:47 2010 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.49 2010/02/09 03:19:50 cnst Exp $
+# $NetBSD: XEN3_DOM0,v 1.50 2010/02/21 05:16:29 cnst Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -298,8 +298,13 @@
 #dbcool* at iic? addr 0x2D             # Tyan S2881
 #dbcool* at iic? addr 0x2E             # Tyan S2882-D
 
+# Winbond LPC Super I/O
+#wbsio*        at isa? port 0x2e
+#wbsio*        at isa? port 0x4e
+
 # LM7[89] and compatible hardware monitors
 #lm0   at isa? port 0x290              # other common: 0x280, 0x310, 0xc00
+#lm*   at wbsio?
 
 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
 #viaenv*       at pci? dev ? function ?
diff -r 1fb1cf37457d -r 752521fc5eb6 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun Feb 21 04:00:47 2010 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.238 2010/02/12 15:51:16 hubertf Exp $
+# $NetBSD: ALL,v 1.239 2010/02/21 05:16:29 cnst 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.238 $"
+#ident                 "ALL-$Revision: 1.239 $"
 
 maxusers       64              # estimated number of users
 
@@ -698,8 +698,13 @@
 # iTE IT87xxF Super I/O with watchdog and sensors support
 itesio0        at isa? port 0x2e
 
+# Winbond LPC Super I/O
+wbsio* at isa? port 0x2e
+wbsio* at isa? port 0x4e
+
 # LM7[89] and compatible hardware monitors
 lm0    at isa? port 0x290 flags 0x0    # other common: 0x280, 0x310
+lm*    at wbsio?
 
 # SMSC LPC47B397 hardware monitor functions
 smsc0  at isa? port 0x02e
diff -r 1fb1cf37457d -r 752521fc5eb6 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Feb 21 04:00:47 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.968 2010/02/12 15:51:16 hubertf Exp $
+# $NetBSD: GENERIC,v 1.969 2010/02/21 05:16:29 cnst Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.968 $"
+#ident                 "GENERIC-$Revision: 1.969 $"
 
 maxusers       64              # estimated number of users
 
@@ -652,9 +652,14 @@
 # iTE IT87xxF Super I/O with watchdog and sensors support
 #itesio0       at isa? port 0x2e
 
+# Winbond LPC Super I/O
+#wbsio*        at isa? port 0x2e
+#wbsio*        at isa? port 0x4e
+
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
 #lm0   at isa? port 0x290 flags 0x0    # other common: 0x280, 0x310
+#lm*   at wbsio?
 
 # SMSC LPC47B397 hardware monitor functions
 #smsc0 at isa? port 0x02e
diff -r 1fb1cf37457d -r 752521fc5eb6 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Sun Feb 21 04:00:47 2010 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Sun Feb 21 05:16:29 2010 +0000
@@ -1,4 +1,4 @@
Prev by Date: [src/trunk]: src/doc mention wbsio(4) in doc/CHANGES
Next by Date: [src/trunk]: src/sys/arch/arm/s3c2xx0 Modify definitions for ULCOM register o...
Previous by Thread: [src/trunk]: src/doc mention wbsio(4) in doc/CHANGES
Next by Thread: [src/trunk]: src/sys/arch/arm/s3c2xx0 Modify definitions for ULCOM register o...
Indexes:
Home | Main Index | Thread Index | Old Index