Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386 Add a driver for the watchdog timer on the AMD...
details: https://anonhg.NetBSD.org/src/rev/f477608eae1f
branches: trunk
changeset: 584515:f477608eae1f
user: dyoung <dyoung%NetBSD.org@localhost>
date: Thu Sep 22 07:09:35 2005 +0000
description:
Add a driver for the watchdog timer on the AMD Geode SC1100.
diffstat:
sys/arch/i386/conf/GENERIC | 6 +-
sys/arch/i386/conf/files.i386 | 7 +-
sys/arch/i386/pci/geode.c | 284 ++++++++++++++++++++++++++++++++++++++++++
sys/arch/i386/pci/geodereg.h | 166 ++++++++++++++++++++++++
4 files changed, 460 insertions(+), 3 deletions(-)
diffs (truncated from 506 to 300 lines):
diff -r de67faafd258 -r f477608eae1f sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Thu Sep 22 06:45:03 2005 +0000
+++ b/sys/arch/i386/conf/GENERIC Thu Sep 22 07:09:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.700 2005/09/14 08:22:24 tron Exp $
+# $NetBSD: GENERIC,v 1.701 2005/09/22 07:09:35 dyoung Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.700 $"
+#ident "GENERIC-$Revision: 1.701 $"
maxusers 32 # estimated number of users
@@ -1216,6 +1216,8 @@
# Miscellaneous Devices
+geodewdog* at pci? dev ? function ? # AMD Geode SC1100 watchdog timer
+
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
diff -r de67faafd258 -r f477608eae1f sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Thu Sep 22 06:45:03 2005 +0000
+++ b/sys/arch/i386/conf/files.i386 Thu Sep 22 07:09:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.269 2005/07/03 12:16:05 cube Exp $
+# $NetBSD: files.i386,v 1.270 2005/09/22 07:09:35 dyoung Exp $
#
# new style config file for i386 architecture
#
@@ -184,6 +184,11 @@
attach elansc at pci
file arch/i386/pci/elan520.c elansc
+# AMD Geode SC1100 Watchdog Timer
+device geodewdog: sysmon_wdog
+attach geodewdog at pci
+file arch/i386/pci/geode.c geodewdog
+
# PCI-EISA bridges
device pceb: eisabus, isabus
attach pceb at pci
diff -r de67faafd258 -r f477608eae1f sys/arch/i386/pci/geode.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/pci/geode.c Thu Sep 22 07:09:35 2005 +0000
@@ -0,0 +1,284 @@
+/* $NetBSD: geode.c,v 1.1 2005/09/22 07:09:35 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 2005 David Young. All rights reserved.
+ *
+ * This code was written by David Young.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by David Young.
+ * 4. The name of David Young may not be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID
+ * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Device driver for the watchdog timer built into the
+ * AMD Geode SC1100 processor.
+ */
+
+#include <sys/cdefs.h>
+
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.1 2005/09/22 07:09:35 dyoung Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/wdog.h>
+#include <uvm/uvm_extern.h>
+#include <machine/bus.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcidevs.h>
+#include <arch/i386/pci/geodereg.h>
+#include <dev/sysmon/sysmonvar.h>
+
+#ifdef GEODE_DEBUG
+#define GEODE_DPRINTF(__x) printf __x
+#else /* GEODE_DEBUG */
+#define GEODE_DPRINTF(__x) /* nothing */
+#endif
+
+struct geode_wdog_softc {
+ struct device sc_dev;
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_ioh;
+ uint16_t sc_countdown;
+ uint8_t sc_prescale;
+
+ struct sysmon_wdog sc_smw;
+};
+
+static void
+geode_wdog_disable(struct geode_wdog_softc *sc)
+{
+ uint16_t wdcnfg;
+
+ /* cancel any pending countdown */
+ sc->sc_countdown = 0;
+ bus_space_write_2(sc->sc_iot, sc->sc_ioh, SC1100_GCB_WDTO, 0);
+ /* power-down clock */
+ wdcnfg = bus_space_read_2(sc->sc_iot, sc->sc_ioh,
+ SC1100_GCB_WDCNFG);
+
+ GEODE_DPRINTF(("%s: wdcnfg %#04" PRIx16 " -> ", __func__, wdcnfg));
+
+ wdcnfg |= SC1100_WDCNFG_WD32KPD;
+ wdcnfg &= ~(SC1100_WDCNFG_WDTYPE2_MASK | SC1100_WDCNFG_WDTYPE1_MASK);
+ /* This no-op is for the reader's benefit. */
+ wdcnfg |= SC1100_WDCNFG_WDTYPE1_NOACTION |
+ SC1100_WDCNFG_WDTYPE2_NOACTION;
+ bus_space_write_2(sc->sc_iot, sc->sc_ioh, SC1100_GCB_WDCNFG, wdcnfg);
+
+ GEODE_DPRINTF(("%#04" PRIx16 "\n", wdcnfg));
+}
+
+static void
+geode_wdog_enable(struct geode_wdog_softc *sc)
+{
+ uint16_t wdcnfg;
+
+ /* power-up clock and set prescale */
+ wdcnfg = bus_space_read_2(sc->sc_iot, sc->sc_ioh, SC1100_GCB_WDCNFG);
+
+ GEODE_DPRINTF(("%s: wdcnfg %#04" PRIx16 " -> ", __func__, wdcnfg));
+
+ wdcnfg &= ~(SC1100_WDCNFG_WD32KPD | SC1100_WDCNFG_WDPRES_MASK |
+ SC1100_WDCNFG_WDTYPE1_MASK | SC1100_WDCNFG_WDTYPE2_MASK);
+ wdcnfg |= LSHIFT(sc->sc_prescale, SC1100_WDCNFG_WDPRES_MASK);
+ wdcnfg |= SC1100_WDCNFG_WDTYPE1_RESET | SC1100_WDCNFG_WDTYPE2_NOACTION;
+
+ bus_space_write_2(sc->sc_iot, sc->sc_ioh, SC1100_GCB_WDCNFG, wdcnfg);
+
+ GEODE_DPRINTF(("%#04" PRIx16 "\n", wdcnfg));
+}
+
+static void
+geode_wdog_reset(struct geode_wdog_softc *sc)
+{
+ /* set countdown */
+ bus_space_write_2(sc->sc_iot, sc->sc_ioh, SC1100_GCB_WDTO,
+ sc->sc_countdown);
+}
+
+static int
+geode_wdog_tickle(struct sysmon_wdog *smw)
+{
+ int s;
+ struct geode_wdog_softc *sc = smw->smw_cookie;
+
+ s = splhigh();
+ geode_wdog_reset(sc);
+ splx(s);
+ return 0;
+}
+
+static int
+geode_wdog_setmode(struct sysmon_wdog *smw)
+{
+ struct geode_wdog_softc *sc = smw->smw_cookie;
+ uint32_t ticks;
+ int prescale, s;
+
+ if ((smw->smw_mode & WDOG_MODE_MASK) == WDOG_MODE_DISARMED) {
+ s = splhigh();
+ geode_wdog_disable(sc);
+ splx(s);
+ return 0;
+ }
+ if (smw->smw_period == WDOG_PERIOD_DEFAULT)
+ smw->smw_period = 32;
+ else if (smw->smw_period > SC1100_WDIVL_MAX) /* too big? */
+ return EINVAL;
+
+ GEODE_DPRINTF(("%s: period %u\n", __func__, smw->smw_period));
+
+ ticks = smw->smw_period * SC1100_WDCLK_HZ;
+
+ GEODE_DPRINTF(("%s: ticks0 %" PRIu32 "\n", __func__, ticks));
+
+ for (prescale = 0; ticks > UINT16_MAX; prescale++)
+ ticks /= 2;
+
+ GEODE_DPRINTF(("%s: ticks %" PRIu32 "\n", __func__, ticks));
+ GEODE_DPRINTF(("%s: prescale %d\n", __func__, prescale));
+
+ KASSERT(prescale <= SC1100_WDCNFG_WDPRES_MAX);
+ KASSERT(ticks <= UINT16_MAX);
+
+ s = splhigh();
+
+ sc->sc_prescale = (uint8_t)prescale;
+ sc->sc_countdown = (uint16_t)ticks;
+
+ geode_wdog_enable(sc);
+
+ geode_wdog_reset(sc);
+
+ splx(s);
+ return 0;
+}
+
+static int
+geode_wdog_match(struct device *parent, struct cfdata *match, void *aux)
+{
+ struct pci_attach_args *pa = aux;
+
+ if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_NS &&
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_NS_SC1100_XBUS)
+ return (10); /* XXX beat pchb? -dyoung */
+
+ return (0);
+}
+
+static void
+geode_wdog_attach(struct device *parent, struct device *self, void *aux)
+{
+ struct geode_wdog_softc *sc = (void *) self;
+ struct pci_attach_args *pa = aux;
+ uint32_t cba;
+ uint8_t wdsts;
+
+ printf(": AMD Geode SC1100 Watchdog Timer\n");
+
+ cba = pci_conf_read(pa->pa_pc, pa->pa_tag, SC1100_XBUS_CBA_SCRATCHPAD);
+ sc->sc_iot = pa->pa_iot;
+ if (bus_space_map(sc->sc_iot, (bus_addr_t)cba, SC1100_GCB_SIZE, 0,
+ &sc->sc_ioh) != 0) {
+ printf("%s: unable to map registers\n", sc->sc_dev.dv_xname);
+ return;
+ }
+
+ GEODE_DPRINTF(("%s: mapped %u bytes at %#08" PRIx32 "\n",
Home |
Main Index |
Thread Index |
Old Index