From owner-svn-src-all@FreeBSD.ORG Thu May 15 03:22:59 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3BAE998; Thu, 15 May 2014 03:22:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4F4329EB; Thu, 15 May 2014 03:22:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F3MwLK026174; Thu, 15 May 2014 03:22:58 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4F3Mw1C026171; Thu, 15 May 2014 03:22:58 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201405150322.s4F3Mw1C026171@svn.freebsd.org> From: Ian Lepore Date: Thu, 15 May 2014 03:22:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266113 - stable/10/sys/arm/rockchip X-SVN-Group: stable-10 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.18 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: Thu, 15 May 2014 03:22:59 -0000 Author: ian Date: Thu May 15 03:22:57 2014 New Revision: 266113 URL: http://svnweb.freebsd.org/changeset/base/266113 Log: MFC r258546: Add watchdog driver for rk3188. Added: stable/10/sys/arm/rockchip/rk30xx_wdog.c - copied unchanged from r258546, head/sys/arm/rockchip/rk30xx_wdog.c stable/10/sys/arm/rockchip/rk30xx_wdog.h - copied unchanged from r258546, head/sys/arm/rockchip/rk30xx_wdog.h Modified: stable/10/sys/arm/rockchip/files.rk30xx Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/rockchip/files.rk30xx ============================================================================== --- stable/10/sys/arm/rockchip/files.rk30xx Thu May 15 03:18:22 2014 (r266112) +++ stable/10/sys/arm/rockchip/files.rk30xx Thu May 15 03:22:57 2014 (r266113) @@ -17,5 +17,6 @@ arm/rockchip/common.c standard arm/rockchip/rk30xx_machdep.c standard arm/rockchip/rk30xx_pmu.c standard arm/rockchip/rk30xx_grf.c standard +arm/rockchip/rk30xx_wdog.c standard arm/rockchip/rk30xx_gpio.c optional gpio dev/usb/controller/dwc_otg_fdt.c optional dwcotg Copied: stable/10/sys/arm/rockchip/rk30xx_wdog.c (from r258546, head/sys/arm/rockchip/rk30xx_wdog.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/arm/rockchip/rk30xx_wdog.c Thu May 15 03:22:57 2014 (r266113, copy of r258546, head/sys/arm/rockchip/rk30xx_wdog.c) @@ -0,0 +1,198 @@ +/*- + * Copyright (c) 2013 Ganbold Tsagaankhuu + * 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 + +#ifndef RK30_WDT_BASE +#define RK30_WDT_BASE 0x2004c000 +#define RK30_WDT_PSIZE 0x100 +#endif + +#define RK30_WDT_READ(_sc, _r) bus_read_4((_sc)->res, (_r)) +#define RK30_WDT_WRITE(_sc, _r, _v) bus_write_4((_sc)->res, (_r), (_v)) + +#define WDOG_CTRL 0x00 +#define WDOG_CTRL_EN (1 << 0) +#define WDOG_CTRL_RSP_MODE (1 << 1) +#define WDOG_CTRL_RST_PULSE (4 << 2) +#define WDOG_CTRL_RST 0xa +#define WDOG_TORR 0x04 +#define WDOG_TORR_INTVL_SHIFT 0 +#define WDOG_CCVR 0x08 +#define WDOG_CRR 0x0c +#define WDOG_CRR_PWD 0x76 +#define WDOG_STAT 0x10 +#define WDOG_EOI 0x14 + +static struct rk30_wd_softc *rk30_wd_sc = NULL; + +struct rk30_wd_softc { + device_t dev; + struct resource *res; + struct mtx mtx; + int freq; +}; + +static void rk30_wd_watchdog_fn(void *private, u_int cmd, int *error); + +static int +rk30_wd_probe(device_t dev) +{ + + if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-wdt")) { + device_set_desc(dev, "Rockchip RK30XX Watchdog"); + return (BUS_PROBE_DEFAULT); + } + + return (ENXIO); +} + +static int +rk30_wd_attach(device_t dev) +{ + struct rk30_wd_softc *sc; + int rid; + phandle_t node; + pcell_t cell; + + if (rk30_wd_sc != NULL) + return (ENXIO); + + sc = device_get_softc(dev); + sc->dev = dev; + + node = ofw_bus_get_node(sc->dev); + if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) > 0) + sc->freq = cell / 1000000; + else + return (ENXIO); + + 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); + } + + rk30_wd_sc = sc; + mtx_init(&sc->mtx, "RK30XX Watchdog", "rk30_wd", MTX_DEF); + EVENTHANDLER_REGISTER(watchdog_list, rk30_wd_watchdog_fn, sc, 0); + + return (0); +} + +static void +rk30_wd_watchdog_fn(void *private, u_int cmd, int *error) +{ + struct rk30_wd_softc *sc; + uint64_t ms, m, max; + int i; + + sc = private; + mtx_lock(&sc->mtx); + + cmd &= WD_INTERVAL; + + if (cmd > 0) { + ms = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000; + m = 0xffff / sc->freq; + max = 0x7fffffff / sc->freq + 1; + i = 0; + while (m < max && m < ms) { + m <<= 1; + i++; + } + if (m < max) { + RK30_WDT_WRITE(sc, WDOG_TORR, + i << WDOG_TORR_INTVL_SHIFT); + RK30_WDT_WRITE(sc, WDOG_CTRL, + WDOG_CTRL_EN | WDOG_CTRL_RSP_MODE | + WDOG_CTRL_RST_PULSE); + RK30_WDT_WRITE(sc, WDOG_CRR, WDOG_CRR_PWD); + *error = 0; + } else { + device_printf(sc->dev, "Can not be disabled\n"); + mtx_unlock(&sc->mtx); + RK30_WDT_WRITE(sc, WDOG_CTRL, WDOG_CTRL_RST); + return; + } + } + else + RK30_WDT_WRITE(sc, WDOG_CTRL, WDOG_CTRL_RST); + + mtx_unlock(&sc->mtx); +} + +void +rk30_wd_watchdog_reset() +{ + bus_space_handle_t bsh; + + bus_space_map(fdtbus_bs_tag, RK30_WDT_BASE, RK30_WDT_PSIZE, 0, &bsh); + bus_space_write_4(fdtbus_bs_tag, bsh, WDOG_TORR, 0); + bus_space_write_4(fdtbus_bs_tag, bsh, WDOG_CTRL, + WDOG_CTRL_EN | WDOG_CTRL_RSP_MODE | WDOG_CTRL_RST_PULSE); + + while (1); +} + +static device_method_t rk30_wd_methods[] = { + DEVMETHOD(device_probe, rk30_wd_probe), + DEVMETHOD(device_attach, rk30_wd_attach), + + DEVMETHOD_END +}; + +static driver_t rk30_wd_driver = { + "rk30_wd", + rk30_wd_methods, + sizeof(struct rk30_wd_softc), +}; +static devclass_t rk30_wd_devclass; + +DRIVER_MODULE(rk30_wd, simplebus, rk30_wd_driver, rk30_wd_devclass, 0, 0); Copied: stable/10/sys/arm/rockchip/rk30xx_wdog.h (from r258546, head/sys/arm/rockchip/rk30xx_wdog.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/arm/rockchip/rk30xx_wdog.h Thu May 15 03:22:57 2014 (r266113, copy of r258546, head/sys/arm/rockchip/rk30xx_wdog.h) @@ -0,0 +1,35 @@ +/*- + * Copyright (c) 2013 Ganbold Tsagaankhuu + * 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 __RK30XX_WDOG_H__ +#define __RK30XX_WDOG_H__ + +void rk30_wd_watchdog_reset(void); + +#endif /*__RK30XX_WDOG_H__*/ +