summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcnst <cnst@NetBSD.org>2010-02-21 05:16:29 +0000
committercnst <cnst@NetBSD.org>2010-02-21 05:16:29 +0000
commit51998ed2d7d48c1029842ca24dc56d564a232fe8 (patch)
tree75adc30e555954ae73b4768ba36c9de16c7cc41e /sys/dev
parent7fe76dd45f0a702dc7d7d2100d36fc46692b539c (diff)
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 (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/files.isa11
-rw-r--r--sys/dev/isa/lm_isa.c7
-rw-r--r--sys/dev/isa/wbsio.c236
3 files changed, 249 insertions, 5 deletions
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 0855ce2884f..94e84f2c06c 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.158 2010/01/19 12:41:41 pooka Exp $
+# $NetBSD: files.isa,v 1.159 2010/02/21 05:16:29 cnst Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -451,9 +451,15 @@ device smsc: sysmon_envsys
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 @@ file dev/isa/toaster.c toaster
# ISA PnP devices often use `device' declarations listed in this file.
#
include "dev/isapnp/files.isapnp"
-
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm_isa.c
index 27a7d3b6b89..b1cc8934835 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa.c,v 1.22 2008/10/12 23:07:32 pgoyette Exp $ */
+/* $NetBSD: lm_isa.c,v 1.23 2010/02/21 05:16:29 cnst Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.22 2008/10/12 23:07:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.23 2010/02/21 05:16:29 cnst Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,6 +63,9 @@ struct lm_isa_softc {
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)
{
diff --git a/sys/dev/isa/wbsio.c b/sys/dev/isa/wbsio.c
new file mode 100644
index 00000000000..9dd159f7556
--- /dev/null
+++ b/sys/dev/isa/wbsio.c
@@ -0,0 +1,236 @@
+/* $NetBSD: wbsio.c,v 1.1 2010/02/21 05:16:29 cnst Exp $ */
+/* $OpenBSD: wbsio.c,v 1.5 2009/03/29 21:53:52 sthen Exp $ */
+/*
+ * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
+ *
+ * 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);
+}