From owner-svn-src-head@FreeBSD.ORG Sun Nov 28 08:11:06 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C256106566B; Sun, 28 Nov 2010 08:11:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 27E9A8FC23; Sun, 28 Nov 2010 08:11:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAS8B6iW079110; Sun, 28 Nov 2010 08:11:06 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAS8B6n8079105; Sun, 28 Nov 2010 08:11:06 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201011280811.oAS8B6n8079105@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 28 Nov 2010 08:11:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215989 - head/sys/mips/cavium X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 08:11:06 -0000 Author: gonzo Date: Sun Nov 28 08:11:05 2010 New Revision: 215989 URL: http://svn.freebsd.org/changeset/base/215989 Log: - Add watchdog driver for Cavium Octeon. At the moment only UP systems are supported. Added: head/sys/mips/cavium/octeon_nmi.S (contents, props changed) head/sys/mips/cavium/octeon_wdog.c (contents, props changed) Modified: head/sys/mips/cavium/files.octeon1 Modified: head/sys/mips/cavium/files.octeon1 ============================================================================== --- head/sys/mips/cavium/files.octeon1 Sun Nov 28 08:09:20 2010 (r215988) +++ head/sys/mips/cavium/files.octeon1 Sun Nov 28 08:11:05 2010 (r215989) @@ -16,6 +16,8 @@ mips/mips/intr_machdep.c standard mips/mips/tick.c standard mips/cavium/octeon_rnd.c optional random +mips/cavium/octeon_wdog.c optional octeon_wdog +mips/cavium/octeon_nmi.S optional octeon_wdog mips/cavium/cryptocteon/cavium_crypto.c optional cryptocteon mips/cavium/cryptocteon/cryptocteon.c optional cryptocteon Added: head/sys/mips/cavium/octeon_nmi.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/cavium/octeon_nmi.S Sun Nov 28 08:11:05 2010 (r215989) @@ -0,0 +1,47 @@ +/*- + * Copyright (c) 2010 Oleksandr Tymoshenko + * All rights reserved. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD$ + */ + +#include + +.set noreorder + +/* + * Only first 128 bytes of handler is used + */ +NESTED_NOPROFILE(octeon_wdog_nmi_handler, 32, ra) + .set push + .set noat + PTR_LA k0, _C_LABEL(octeon_wdog_nmi) + jr k0 + nop +1: + nop + j 1b + nop + .set at +END(octeon_wdog_nmi_handler) Added: head/sys/mips/cavium/octeon_wdog.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/cavium/octeon_wdog.c Sun Nov 28 08:11:05 2010 (r215989) @@ -0,0 +1,259 @@ +/*- + * Copyright (c) 2009, Oleksandr Tymoshenko + * All rights reserved. + * + * 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 unmodified, 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + */ + +/* + * Watchdog driver for Cavium Octeon + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define DEFAULT_TIMER_VAL 65535 + +struct octeon_wdog_softc { + device_t dev; + /* XXX: replace with repscive CVMX_ constant */ + struct resource *irq_res[16]; + void *intr_hdl[16]; + int armed; + int debug; +}; + +extern void octeon_wdog_nmi_handler(void); +void octeon_wdog_nmi(void); + +static void octeon_watchdog_arm_core(int core, unsigned long timer_val); +static void octeon_watchdog_disarm_core(int core); +static int octeon_wdog_attach(device_t dev); +static void octeon_wdog_identify(driver_t *drv, device_t parent); +static int octeon_wdog_intr(void *);; +static int octeon_wdog_probe(device_t dev); +static void octeon_wdog_setup(struct octeon_wdog_softc *sc, int cpu); +static void octeon_wdog_sysctl(device_t dev); +static void octeon_wdog_watchdog_fn(void *private, u_int cmd, int *error); + +void +octeon_wdog_nmi() +{ + + /* XXX: Add something useful here */ + printf("NMI detected\n"); + + /* + * This is the end + * Beautiful friend + * + * Just wait for Soft Reset to come and take us + */ + for (;;) + ; +} + +static void +octeon_watchdog_arm_core(int core, unsigned long timer_val) +{ + cvmx_ciu_wdogx_t ciu_wdog; + + /* Poke it! */ + cvmx_write_csr(CVMX_CIU_PP_POKEX(core), 1); + + ciu_wdog.u64 = 0; + ciu_wdog.s.len = timer_val; + ciu_wdog.s.mode = 3; + cvmx_write_csr(CVMX_CIU_WDOGX(core), ciu_wdog.u64); +} + +static void +octeon_watchdog_disarm_core(int core) +{ + + cvmx_write_csr(CVMX_CIU_WDOGX(core), 0); +} + + + +static void +octeon_wdog_watchdog_fn(void *private, u_int cmd, int *error) +{ + struct octeon_wdog_softc *sc = private; + uint64_t timer_val = 0; + + cmd &= WD_INTERVAL; + if (sc->debug) + device_printf(sc->dev, "octeon_wdog_watchdog_fn: cmd: %x\n", cmd); + if (cmd > 0) { + if (sc->debug) + device_printf(sc->dev, "octeon_wdog_watchdog_fn: programming timer: %jx\n", (uintmax_t) timer_val); + /* + * XXX: This should be done for every core and with value + * calculated based on CPU frquency + */ + octeon_watchdog_arm_core(cvmx_get_core_num(), DEFAULT_TIMER_VAL); + sc->armed = 1; + *error = 0; + } else { + if (sc->debug) + device_printf(sc->dev, "octeon_wdog_watchdog_fn: disarming\n"); + if (sc->armed) { + sc->armed = 0; + /* XXX: This should be done for every core */ + octeon_watchdog_disarm_core(cvmx_get_core_num()); + } + } +} + +static void +octeon_wdog_sysctl(device_t dev) +{ + struct octeon_wdog_softc *sc = device_get_softc(dev); + + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->dev); + struct sysctl_oid *tree = device_get_sysctl_tree(sc->dev); + + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "debug", CTLFLAG_RW, &sc->debug, 0, + "enable watchdog debugging"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "armed", CTLFLAG_RD, &sc->armed, 0, + "whether the watchdog is armed"); +} + +static void +octeon_wdog_setup(struct octeon_wdog_softc *sc, int cpu) +{ + int core, rid, err; + + /* XXX: map cpu id to core here ? */ + core = cvmx_get_core_num(); + + /* Interrupt part */ + rid = 0; + sc->irq_res[core] = + bus_alloc_resource(sc->dev, SYS_RES_IRQ, &rid, + CVMX_IRQ_WDOG0+core, + CVMX_IRQ_WDOG0+core, 1, RF_ACTIVE); + if (!(sc->irq_res[core])) + goto error; + + err = bus_setup_intr(sc->dev, sc->irq_res[core], INTR_TYPE_MISC, + octeon_wdog_intr, NULL, sc, &sc->intr_hdl[core]); + if (err) + goto error; + + /* XXX: pin interrupt handler to the respective core */ + + /* Disarm by default */ + octeon_watchdog_disarm_core(core); + + return; + +error: + panic("failed to setup watchdog interrupt for core %d", core); +} + + +static int +octeon_wdog_intr(void *sc) +{ + + /* Poke it! */ + cvmx_write_csr(CVMX_CIU_PP_POKEX(cvmx_get_core_num()), 1); + + return (FILTER_HANDLED); +} + +static int +octeon_wdog_probe(device_t dev) +{ + + device_set_desc(dev, "Cavium Octeon watchdog timer"); + return (0); +} + +static int +octeon_wdog_attach(device_t dev) +{ + struct octeon_wdog_softc *sc = device_get_softc(dev); + int i; + uint64_t *nmi_handler = (uint64_t*)octeon_wdog_nmi_handler; + + /* Initialise */ + sc->armed = 0; + sc->debug = 0; + + sc->dev = dev; + EVENTHANDLER_REGISTER(watchdog_list, octeon_wdog_watchdog_fn, sc, 0); + octeon_wdog_sysctl(dev); + + for (i = 0; i < 16; i++) { + cvmx_write_csr(CVMX_MIO_BOOT_LOC_ADR, i * 8); + cvmx_write_csr(CVMX_MIO_BOOT_LOC_DAT, nmi_handler[i]); + } + + cvmx_write_csr(CVMX_MIO_BOOT_LOC_CFGX(0), 0x81fc0000); + + /* XXX: This should be done for every core */ + octeon_wdog_setup(sc, cvmx_get_core_num()); + return (0); +} + +static void +octeon_wdog_identify(driver_t *drv, device_t parent) +{ + + BUS_ADD_CHILD(parent, 0, "octeon_wdog", 0); +} + +static device_method_t octeon_wdog_methods[] = { + DEVMETHOD(device_identify, octeon_wdog_identify), + + DEVMETHOD(device_probe, octeon_wdog_probe), + DEVMETHOD(device_attach, octeon_wdog_attach), + {0, 0}, +}; + +static driver_t octeon_wdog_driver = { + "octeon_wdog", + octeon_wdog_methods, + sizeof(struct octeon_wdog_softc), +}; +static devclass_t octeon_wdog_devclass; + +DRIVER_MODULE(octeon_wdog, ciu, octeon_wdog_driver, octeon_wdog_devclass, 0, 0);