tech-kern archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wbsio(4): Winbond Super I/O driver for lm(4) over wbsio(4) attachment



Hi, 

The wbsio(4) driver allows one to attach lm(4) on non-standard IO ports, 
or, alternatively, discover the said non-standard ports, so that an ap- 
propriate lm0 configuration line could be devised for the configuration 
file of the kernel.

Best regards,
Constantine. 
? share/man/man4/wbsio.4?rev=1.2;content-type=text%2Fplain
? sys/arch/i386/compile/MONOLITHIC
? sys/dev/isa/wbsio.c?rev=1.5;content-type=text%2Fplain
Index: share/man/man4/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man4/Makefile,v
retrieving revision 1.504
diff -u -r1.504 Makefile
--- share/man/man4/Makefile     9 Feb 2010 03:19:50 -0000       1.504
+++ share/man/man4/Makefile     17 Feb 2010 04:13:17 -0000
@@ -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
Index: share/man/man4/lm.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/lm.4,v
retrieving revision 1.31
diff -u -r1.31 lm.4
--- share/man/man4/lm.4 12 Feb 2010 10:54:53 -0000      1.31
+++ share/man/man4/lm.4 17 Feb 2010 04:13:17 -0000
@@ -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
Index: share/man/man4/wbsio.4
===================================================================
RCS file: share/man/man4/wbsio.4
diff -N share/man/man4/wbsio.4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ share/man/man4/wbsio.4      17 Feb 2010 04:13:17 -0000
@@ -0,0 +1,58 @@
+.\"    $NetBSD$
+.\"    $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 .
Index: sys/arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.266
diff -u -r1.266 GENERIC
--- sys/arch/amd64/conf/GENERIC 9 Feb 2010 03:19:50 -0000       1.266
+++ sys/arch/amd64/conf/GENERIC 17 Feb 2010 04:13:17 -0000
@@ -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
Index: sys/arch/amd64/conf/XEN3_DOM0
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/XEN3_DOM0,v
retrieving revision 1.49
diff -u -r1.49 XEN3_DOM0
--- sys/arch/amd64/conf/XEN3_DOM0       9 Feb 2010 03:19:50 -0000       1.49
+++ sys/arch/amd64/conf/XEN3_DOM0       17 Feb 2010 04:13:17 -0000
@@ -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 ?
Index: sys/arch/i386/conf/ALL
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/ALL,v
retrieving revision 1.238
diff -u -r1.238 ALL
--- sys/arch/i386/conf/ALL      12 Feb 2010 15:51:16 -0000      1.238
+++ sys/arch/i386/conf/ALL      17 Feb 2010 04:13:18 -0000
@@ -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
Index: sys/arch/i386/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.968
diff -u -r1.968 GENERIC
--- sys/arch/i386/conf/GENERIC  12 Feb 2010 15:51:16 -0000      1.968
+++ sys/arch/i386/conf/GENERIC  17 Feb 2010 04:13:18 -0000
@@ -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
Index: sys/arch/i386/conf/XEN3_DOM0
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/XEN3_DOM0,v
retrieving revision 1.28
diff -u -r1.28 XEN3_DOM0
--- sys/arch/i386/conf/XEN3_DOM0        8 Feb 2010 21:45:32 -0000       1.28
+++ sys/arch/i386/conf/XEN3_DOM0        17 Feb 2010 04:13:18 -0000
@@ -281,9 +281,14 @@
 #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
 # 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, 0xc00
+#lm*   at wbsio?
 
 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
 #viaenv*       at pci? dev ? function ?
Index: sys/dev/isa/files.isa
===================================================================
RCS file: /cvsroot/src/sys/dev/isa/files.isa,v
retrieving revision 1.158
diff -u -r1.158 files.isa
--- sys/dev/isa/files.isa       19 Jan 2010 12:41:41 -0000      1.158
+++ sys/dev/isa/files.isa       17 Feb 2010 04:13:20 -0000
@@ -451,9 +451,15 @@
 attach smsc at isa with smsc
 file   dev/isa/smsc.c                  smsc                    needs-flag
 
+# Winbond LPC Super I/O
+device wbsio {}
+attach wbsio at isa
+file   dev/isa/wbsio.c                 wbsio
+
 # LM78 temp/fanspeed monitor
 attach lm at isa with lm_isa
-file   dev/isa/lm_isa.c                lm_isa
+attach lm at wbsio with lm_wbsio
+file   dev/isa/lm_isa.c                lm_isa | lm_wbsio
 
 # iTE Super I/O with hardware monitor
 device itesio: sysmon_envsys, sysmon_wdog
@@ -521,4 +527,3 @@
 # ISA PnP devices often use `device' declarations listed in this file.
 #
 include        "dev/isapnp/files.isapnp"
-
Index: sys/dev/isa/lm_isa.c
===================================================================
RCS file: /cvsroot/src/sys/dev/isa/lm_isa.c,v
retrieving revision 1.22
diff -u -r1.22 lm_isa.c
--- sys/dev/isa/lm_isa.c        12 Oct 2008 23:07:32 -0000      1.22
+++ sys/dev/isa/lm_isa.c        17 Feb 2010 04:13:20 -0000
@@ -63,6 +63,9 @@
 CFATTACH_DECL_NEW(lm_isa, sizeof(struct lm_isa_softc),
     lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
 
+CFATTACH_DECL_NEW(lm_wbsio, sizeof(struct lm_isa_softc),
+    lm_isa_match, lm_isa_attach, lm_isa_detach, NULL);
+
 int
 lm_isa_match(device_t parent, cfdata_t match, void *aux)
 {
Index: sys/dev/isa/wbsio.c
===================================================================
RCS file: sys/dev/isa/wbsio.c
diff -N sys/dev/isa/wbsio.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ sys/dev/isa/wbsio.c 17 Feb 2010 04:13:20 -0000
@@ -0,0 +1,236 @@
+/*     $NetBSD$        */
+/*     $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen 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.
+ */
+
+/*
+ * Winbond LPC Super I/O driver.
+ */
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+
+#include <machine/bus.h>
+
+#include <dev/isa/isareg.h>
+#include <dev/isa/isavar.h>
+
+/* ISA bus registers */
+#define WBSIO_INDEX            0x00    /* Configuration Index Register */
+#define WBSIO_DATA             0x01    /* Configuration Data Register */
+
+#define WBSIO_IOSIZE           0x02    /* ISA I/O space size */
+
+#define WBSIO_CONF_EN_MAGIC    0x87    /* enable configuration mode */
+#define WBSIO_CONF_DS_MAGIC    0xaa    /* disable configuration mode */
+
+/* Configuration Space Registers */
+#define WBSIO_LDN              0x07    /* Logical Device Number */
+#define WBSIO_ID               0x20    /* Device ID */
+#define WBSIO_REV              0x21    /* Device Revision */
+
+#define WBSIO_ID_W83627HF      0x52
+#define WBSIO_ID_W83627THF     0x82
+#define WBSIO_ID_W83627EHF     0x88
+#define WBSIO_ID_W83627DHG     0xa0
+#define WBSIO_ID_W83627SF      0x59
+#define WBSIO_ID_W83637HF      0x70
+#define WBSIO_ID_W83697HF      0x60
+
+/* Logical Device Number (LDN) Assignments */
+#define WBSIO_LDN_HM           0x0b
+
+/* Hardware Monitor Control Registers (LDN B) */
+#define WBSIO_HM_ADDR_MSB      0x60    /* Address [15:8] */
+#define WBSIO_HM_ADDR_LSB      0x61    /* Address [7:0] */
+
+struct wbsio_softc {
+       struct device           sc_dev;
+
+       bus_space_tag_t         sc_iot;
+       bus_space_handle_t      sc_ioh;
+};
+
+int    wbsio_probe(device_t, cfdata_t, void *);
+void   wbsio_attach(device_t, device_t, void *);
+int    wbsio_print(void *, const char *);
+
+CFATTACH_DECL_NEW(wbsio, sizeof(struct wbsio_softc),
+    wbsio_probe, wbsio_attach, NULL, NULL);
+
+static __inline void
+wbsio_conf_enable(bus_space_tag_t iot, bus_space_handle_t ioh)
+{
+       bus_space_write_1(iot, ioh, WBSIO_INDEX, WBSIO_CONF_EN_MAGIC);
+       bus_space_write_1(iot, ioh, WBSIO_INDEX, WBSIO_CONF_EN_MAGIC);
+}
+
+static __inline void
+wbsio_conf_disable(bus_space_tag_t iot, bus_space_handle_t ioh)
+{
+       bus_space_write_1(iot, ioh, WBSIO_INDEX, WBSIO_CONF_DS_MAGIC);
+}
+
+static __inline u_int8_t
+wbsio_conf_read(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t index)
+{
+       bus_space_write_1(iot, ioh, WBSIO_INDEX, index);
+       return (bus_space_read_1(iot, ioh, WBSIO_DATA));
+}
+
+static __inline void
+wbsio_conf_write(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t index,
+    u_int8_t data)
+{
+       bus_space_write_1(iot, ioh, WBSIO_INDEX, index);
+       bus_space_write_1(iot, ioh, WBSIO_DATA, data);
+}
+
+int
+wbsio_probe(device_t parent, cfdata_t match, void *aux)
+{
+       struct isa_attach_args *ia = aux;
+       bus_space_tag_t iot;
+       bus_space_handle_t ioh;
+       u_int8_t reg;
+
+       /* Must supply an address */
+       if (ia->ia_nio < 1)
+               return 0;
+
+       if (ISA_DIRECT_CONFIG(ia))
+               return 0;
+
+       if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
+               return 0;
+
+       /* Match by device ID */
+       iot = ia->ia_iot;
+       if (bus_space_map(iot, ia->ia_io[0].ir_addr, WBSIO_IOSIZE, 0, &ioh))
+               return 0;
+       wbsio_conf_enable(iot, ioh);
+       reg = wbsio_conf_read(iot, ioh, WBSIO_ID);
+       aprint_debug("wbsio_probe: id 0x%02x\n", reg);
+       wbsio_conf_disable(iot, ioh);
+       bus_space_unmap(iot, ioh, WBSIO_IOSIZE);
+       switch (reg) {
+       case WBSIO_ID_W83627HF:
+       case WBSIO_ID_W83627THF:
+       case WBSIO_ID_W83627EHF:
+       case WBSIO_ID_W83627DHG:
+       case WBSIO_ID_W83637HF:
+       case WBSIO_ID_W83697HF:
+               ia->ia_nio = 1;
+               ia->ia_io[0].ir_size = WBSIO_IOSIZE;
+               ia->ia_niomem = 0;
+               ia->ia_nirq = 0;
+               ia->ia_ndrq = 0;
+               return 1;
+       }
+
+       return 0;
+}
+
+void
+wbsio_attach(device_t parent, device_t self, void *aux)
+{
+       struct wbsio_softc *sc = (void *)self;
+       struct isa_attach_args *ia = aux;
+       struct isa_attach_args nia;
+       const char *desc = NULL;
+       u_int8_t reg, reg0, reg1;
+       u_int16_t iobase;
+
+       /* Map ISA I/O space */
+       sc->sc_iot = ia->ia_iot;
+       if (bus_space_map(sc->sc_iot, ia->ia_io[0].ir_addr,
+           WBSIO_IOSIZE, 0, &sc->sc_ioh)) {
+               aprint_error(": can't map i/o space\n");
+               return;
+       }
+
+       /* Enter configuration mode */
+       wbsio_conf_enable(sc->sc_iot, sc->sc_ioh);
+
+       /* Read device ID */
+       reg = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_ID);
+       switch (reg) {
+       case WBSIO_ID_W83627HF:
+               desc = "W83627HF";
+               break;
+       case WBSIO_ID_W83627THF:
+               desc = "W83627THF";
+               break;
+       case WBSIO_ID_W83627EHF:
+               desc = "W83627EHF";
+               break;
+       case WBSIO_ID_W83627DHG:
+               desc = "W83627DHG";
+               break;
+       case WBSIO_ID_W83637HF:
+               desc = "W83637HF";
+               break;
+       case WBSIO_ID_W83697HF:
+               desc = "W83697HF";
+               break;
+       }
+
+       /* Read device revision */
+       reg = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_REV);
+
+       aprint_naive("\n");
+       aprint_normal(": Winbond LPC Super I/O %s rev 0x%02x\n", desc, reg);
+
+       /* Select HM logical device */
+       wbsio_conf_write(sc->sc_iot, sc->sc_ioh, WBSIO_LDN, WBSIO_LDN_HM);
+
+       /*
+        * The address should be 8-byte aligned, but it seems some
+        * BIOSes ignore this.  They get away with it, because
+        * Apparently the hardware simply ignores the lower three
+        * bits.  We do the same here.
+        */
+       reg0 = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_HM_ADDR_LSB);
+       reg1 = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_HM_ADDR_MSB);
+       iobase = (reg1 << 8) | (reg0 & ~0x7);
+
+       /* Escape from configuration mode */
+       wbsio_conf_disable(sc->sc_iot, sc->sc_ioh);
+
+       if (iobase == 0)
+               return;
+
+       nia = *ia;
+       nia.ia_io[0].ir_addr = iobase;
+       config_found(self, &nia, wbsio_print);
+}
+
+int
+wbsio_print(void *aux, const char *pnp)
+{
+       struct isa_attach_args *ia = aux;
+
+       if (pnp)
+               aprint_normal("%s", pnp);
+       if (ia->ia_io[0].ir_size)
+               aprint_normal(" port 0x%x", ia->ia_io[0].ir_addr);
+       if (ia->ia_io[0].ir_size > 1)
+               aprint_normal("-0x%x", ia->ia_io[0].ir_addr +
+                   ia->ia_io[0].ir_size - 1);
+       return (UNCONF);
+}


Home | Main Index | Thread Index | Old Index