From owner-svn-src-all@FreeBSD.ORG Mon Feb 11 11:31:25 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 434C47D2; Mon, 11 Feb 2013 11:31:25 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1BCEB1F03; Mon, 11 Feb 2013 11:31:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BBVOBg072311; Mon, 11 Feb 2013 11:31:24 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BBVOZK072306; Mon, 11 Feb 2013 11:31:24 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201302111131.r1BBVOZK072306@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Mon, 11 Feb 2013 11:31:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246660 - in head/sys: arm/allwinner boot/fdt/dts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2013 11:31:25 -0000 Author: gonzo Date: Mon Feb 11 11:31:23 2013 New Revision: 246660 URL: http://svnweb.freebsd.org/changeset/base/246660 Log: Add watchdog driver for Allwinner A10 Added: head/sys/arm/allwinner/a10_wdog.c (contents, props changed) head/sys/arm/allwinner/a10_wdog.h (contents, props changed) Modified: head/sys/arm/allwinner/files.a10 head/sys/boot/fdt/dts/cubieboard.dts Added: head/sys/arm/allwinner/a10_wdog.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/a10_wdog.c Mon Feb 11 11:31:23 2013 (r246660) @@ -0,0 +1,194 @@ +/*- + * Copyright (c) 2013 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. + */ +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#define READ(_sc, _r) bus_read_4((_sc)->res, (_r)) +#define WRITE(_sc, _r, _v) bus_write_4((_sc)->res, (_r), (_v)) + +#define WDOG_CTRL 0x00 +#define WDOG_CTRL_RESTART (1 << 0) +#define WDOG_MODE 0x04 +#define WDOG_MODE_INTVL_SHIFT 3 +#define WDOG_MODE_RST_EN (1 << 1) +#define WDOG_MODE_EN (1 << 0) + +struct a10wd_interval { + uint64_t milliseconds; + unsigned int value; +}; + +struct a10wd_interval wd_intervals[] = { + { 500, 0 }, + { 1000, 1 }, + { 2000, 2 }, + { 3000, 3 }, + { 4000, 4 }, + { 5000, 5 }, + { 6000, 6 }, + { 8000, 7 }, + { 10000, 8 }, + { 12000, 9 }, + { 14000, 10 }, + { 16000, 11 }, + { 0, 0 } /* sentinel */ +}; + +static struct a10wd_softc *a10wd_sc = NULL; + +struct a10wd_softc { + device_t dev; + struct resource * res; + struct mtx mtx; +}; + +static void a10wd_watchdog_fn(void *private, u_int cmd, int *error); + +static int +a10wd_probe(device_t dev) +{ + + printf("A10 watchdog probe\n"); + if (ofw_bus_is_compatible(dev, "allwinner,sun4i-wdt")) { + device_set_desc(dev, "Allwinner A10 Watchdog"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +static int +a10wd_attach(device_t dev) +{ + struct a10wd_softc *sc; + int rid; + + if (a10wd_sc != NULL) + return (ENXIO); + + sc = device_get_softc(dev); + sc->dev = dev; + + rid = 0; + sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (sc->res == NULL) { + device_printf(dev, "could not allocate memory resource\n"); + return (ENXIO); + } + + a10wd_sc = sc; + mtx_init(&sc->mtx, "A10 Watchdog", "a10wd", MTX_DEF); + EVENTHANDLER_REGISTER(watchdog_list, a10wd_watchdog_fn, sc, 0); + + return (0); +} + +static void +a10wd_watchdog_fn(void *private, u_int cmd, int *error) +{ + struct a10wd_softc *sc; + uint64_t ms; + int i; + + sc = private; + mtx_lock(&sc->mtx); + + cmd &= WD_INTERVAL; + + if (cmd > 0) { + ms = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000; + i = 0; + while (wd_intervals[i].milliseconds && + (ms > wd_intervals[i].milliseconds)) + i++; + if (wd_intervals[i].milliseconds) { + WRITE(sc, WDOG_MODE, + (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) | + WDOG_MODE_EN | WDOG_MODE_RST_EN); + WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART); + } + } + else + WRITE(sc, WDOG_MODE, 0); + + mtx_unlock(&sc->mtx); +} + +void +a10wd_watchdog_reset() +{ + + if (a10wd_sc == NULL) { + printf("Reset: watchdog device has not been initialized\n"); + return; + } + + WRITE(a10wd_sc, WDOG_MODE, + (wd_intervals[0].value << WDOG_MODE_INTVL_SHIFT) | + WDOG_MODE_EN | WDOG_MODE_RST_EN); + + while(1) + ; + +} + +static device_method_t a10wd_methods[] = { + DEVMETHOD(device_probe, a10wd_probe), + DEVMETHOD(device_attach, a10wd_attach), + + DEVMETHOD_END +}; + +static driver_t a10wd_driver = { + "a10wd", + a10wd_methods, + sizeof(struct a10wd_softc), +}; +static devclass_t a10wd_devclass; + +DRIVER_MODULE(a10wd, simplebus, a10wd_driver, a10wd_devclass, 0, 0); Added: head/sys/arm/allwinner/a10_wdog.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/allwinner/a10_wdog.h Mon Feb 11 11:31:23 2013 (r246660) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2013 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$ + * + */ +#ifndef __A10_WDOG_H__ +#define __A10_WDOG_H__ + +void a10wd_watchdog_reset(void); + +#endif /*__A10_WDOG_H__*/ + Modified: head/sys/arm/allwinner/files.a10 ============================================================================== --- head/sys/arm/allwinner/files.a10 Mon Feb 11 10:58:22 2013 (r246659) +++ head/sys/arm/allwinner/files.a10 Mon Feb 11 11:31:23 2013 (r246660) @@ -12,6 +12,7 @@ arm/arm/irq_dispatch.S standard arm/allwinner/a10_clk.c standard arm/allwinner/a10_gpio.c optional gpio arm/allwinner/a10_ehci.c optional ehci +arm/allwinner/a10_wdog.c standard arm/allwinner/timer.c standard arm/allwinner/aintc.c standard arm/allwinner/bus_space.c standard Modified: head/sys/boot/fdt/dts/cubieboard.dts ============================================================================== --- head/sys/boot/fdt/dts/cubieboard.dts Mon Feb 11 10:58:22 2013 (r246659) +++ head/sys/boot/fdt/dts/cubieboard.dts Mon Feb 11 11:31:23 2013 (r246660) @@ -76,6 +76,12 @@ clock-frequency = < 24000000 >; }; + watchdog@01c20c90 { + compatible = "allwinner,sun4i-wdt"; + reg = <0x01c20c90 0x08>; + }; + + GPIO: gpio@01c20800 { #gpio-cells = <3>; compatible = "allwinner,sun4i-gpio";